From 0a3928ca26242304f690f6e5d0c7e0f9c874af4b Mon Sep 17 00:00:00 2001
From: lkitching <lee@swirrl.com>
Date: Thu, 11 Oct 2018 17:04:23 +0100
Subject: [PATCH] Log using clojure.tools.logging.

Add clojure.tools.logging dependency and use it for logging
informational messages instead of writing directly to the console.

Change the log level for the console appender to WARN so these
messages are not displayed by default.
---
 project.clj                | 1 +
 resources/log4j2.xml       | 2 +-
 src/rdf_validator/core.clj | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 94184a1..7b5d6e6 100644
--- a/project.clj
+++ b/project.clj
@@ -6,6 +6,7 @@
   :repositories [["apache-releases" {:url "https://repository.apache.org/content/repositories/releases/"}]]
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [org.clojure/tools.cli "0.3.7"]
+                 [org.clojure/tools.logging "0.4.1"]
                  [grafter "0.11.5"]
                  [org.apache.jena/apache-jena-libs "3.8.0" :extension "pom"]
                  [selmer "1.12.0"]
diff --git a/resources/log4j2.xml b/resources/log4j2.xml
index 5e14a92..820fb8c 100644
--- a/resources/log4j2.xml
+++ b/resources/log4j2.xml
@@ -6,7 +6,7 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Root level="info">
+        <Root level="warn">
             <AppenderRef ref="Console"/>
         </Root>
     </Loggers>
diff --git a/src/rdf_validator/core.clj b/src/rdf_validator/core.clj
index 0feb667..090b3de 100644
--- a/src/rdf_validator/core.clj
+++ b/src/rdf_validator/core.clj
@@ -9,6 +9,7 @@
             [rdf-validator.query :as query]
             [selmer.parser :as selmer]
             [selmer.util :refer [without-escaping set-missing-value-formatter!]]
+            [clojure.tools.logging :as log]
             [clojure.edn :as edn])
   (:import [java.net URI URISyntaxException]
            [org.apache.jena.query QueryFactory Syntax]
@@ -17,18 +18,18 @@
 (defn file->repository [^File f]
   (if (.isDirectory f)
     (let [r (repo/sail-repo)]
-      (println "Creating repository from directory: " (.getAbsolutePath f))
+      (log/info "Creating repository from directory: " (.getAbsolutePath f))
       (doseq [df (.listFiles f)]
         (rdf/add r (rdf/statements df)))
       r)
     (do
-      (println "Creating repository from file: " (.getAbsolutePath f))
+      (log/info "Creating repository from file: " (.getAbsolutePath f))
       (repo/fixture-repo f))))
 
 (defmulti uri->repository (fn [^URI uri] (some-> (.getScheme uri) keyword)))
 
 (defn- create-sparql-repo [uri]
-  (println "Creating SPARQL repository: " (str uri))
+  (log/info "Creating SPARQL repository: " (str uri))
   (repo/sparql-repo (str uri)))
 
 (defmethod uri->repository :http [uri]
@@ -182,4 +183,3 @@
         (System/exit (+ failed errored)))
       (do (invalid-args result)
           (System/exit 1)))))
-