Merge pull request #19 from shopsmart/err-to-warn

Log/err to log/warn during retries

Author: coconutpalm

project.clj

@@ -1,4 +1,4 @@
-(defproject com.github.shopsmart/clj-foundation "0.9.19"
+(defproject com.github.shopsmart/clj-foundation "0.9.20"
   :description "Common patterns enabling simpler to be easier and harder to be possibler."
   :url "https://github.com/shopsmart/clj-foundation"
 
@@ -11,11 +11,16 @@
             [lein-kibit "0.1.2"]          ; lein kibit - Linter that suggests more idiomatic forms
             ]
 
+  :repl {:jvm-opts ["-Dlog4j.configurationFile=log4j2-subproject.xml"]}
+
   ;; Used in clj-foundation.config unit tests
   :jvm-opts ["-DCONFIG-PROD=/tmp/_test-config-prod.edn"]
 
+
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [org.clojure/tools.logging "0.3.1"]
+                 [org.slf4j/slf4j-api "1.7.21"]
+                 [org.slf4j/slf4j-simple "1.7.21"]
                  [org.clojure/data.csv "0.1.3"]
                  [org.clojure/data.xml "0.0.8"]
                  [prismatic/schema "1.1.1"]

resources/log4j2-subproject.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="TRACE">
+    <Properties>
+        <Property name="format">%date{ISO8601} [%level{length=1}] (%thread) %logger: %message%n</Property>
+    </Properties>
+
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="${format}"/>
+        </Console>
+    </Appenders>
+
+    <Loggers>
+        <Logger name="org.apache.http" level="WARN"/>
+        <Logger name="com.amazonaws" level="WARN"/>
+
+        <Root level="TRACE">
+            <AppenderRef ref="Console" level="INFO"/>
+        </Root>
+    </Loggers>
+</Configuration>

src/clj_foundation/errors.clj

@@ -134,8 +134,8 @@
         res
         (do
           (if (instance? Throwable res)
-            (log/error res "A failure occurred; retrying...")
-            (log/error (str "A failure occurred; retrying...  [" (pr-str res) "]")))
+            (log/warn res "A failure occurred; retrying...")
+            (log/warn (str "A failure occurred; retrying...  [" (pr-str res) "]")))
           (Thread/sleep pause-millis)
           (recur (dec tries) pause-millis f args))))))
 
@@ -152,7 +152,7 @@
                      {:exception e})))]
     (if (:exception res)
       (do
-        (log/error (:exception res) "A failure occurred; retrying...")
+        (log/warn (:exception res) "A failure occurred; retrying...")
         (Thread/sleep pause-millis)
         (recur (dec tries) pause-millis f args))
       (:value res))))
@@ -265,15 +265,15 @@
         (if (failure? result)
           (do
             (case (retry? j result)
-              :ABORT-MAX-RETRIES (do (log/error (RuntimeException. (str "MAX-RETRIES(" tries ")[" job-name "]: " (.getMessage result)) result))
+              :ABORT-MAX-RETRIES (do (log/warn (RuntimeException. (str "MAX-RETRIES(" tries ")[" job-name "]: " (.getMessage result)) result))
                                      (throw result))
-              :ABORT-FATAL-ERROR (do (log/error (RuntimeException. (str "FATAL[" job-name "]: " (.getMessage result)) result))
+              :ABORT-FATAL-ERROR (do (log/warn (RuntimeException. (str "FATAL[" job-name "]: " (.getMessage result)) result))
                                      (throw result))
-              :RETRY-FAILURE     (do (log/error result (str "RETRY[" job-name "]; " (type result) ": " (.getMessage result)))
+              :RETRY-FAILURE     (do (log/warn result (str "RETRY[" job-name "]; " (type result) ": " (.getMessage result)))
                                      (Thread/sleep pause-millis))
-              :RETRY-TIMEOUT     (do (log/error (RuntimeException. "Timeout.") (str "RETRY[" job-name "]: Took longer than " timeout-millis " ms."))
+              :RETRY-TIMEOUT     (do (log/warn (RuntimeException. "Timeout.") (str "RETRY[" job-name "]: Took longer than " timeout-millis " ms."))
                                      (Thread/sleep pause-millis))
-              :else              (throw     (IllegalStateException. "Program Error!  We should never get here.")))
+              :else              (throw (IllegalStateException. "Program Error!  We should never get here.")))
             (recur (update-in j [:retries] inc)))
           result)))))