Don't call (format) if we're only logging 1 argument.

paraseba · May 18, 2011 · a963539 · a963539
1 parent 65359e5
commit a963539
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/justlogit.clj b/src/justlogit.clj
@@ -46,14 +46,19 @@
   (>= (or (int-level level) Integer/MAX_VALUE)
       (or (int-level @*log-level*) Integer/MIN_VALUE)))
 
+(defn format-if-needed [& args]
+  (apply
+   (if (> (count args) 1) format str)
+   args))
+
 (defmacro log [level throwable & args]
   `(when (enabled? ~level)
      (let [s# (@*log-formatter*
                  {:timestamp (java.util.Date.)
                   :namespace (.name ~*ns*)
                   :level (name ~level)
                   :throwable ~throwable
-                  :message (format ~@args)})]
+                  :message (format-if-needed ~@args)})]
        (locking @*log-writer*
          (.write @*log-writer* s#)
          (.flush @*log-writer*)))))

diff --git a/test/justlogit_test.clj b/test/justlogit_test.clj
@@ -94,6 +94,8 @@
   (set-log-level :warn))
 
 (deftest arguments
+  (logs-message :fatal "100% broken!" (fatal "100% broken!"))
+  (is (thrown? java.util.FormatFlagsConversionMismatchException (fatal "%s is 100% broken!" "foo")))
   (logs-message :fatal "Hi foo" (fatal "Hi %s" "foo"))
   (logs-message :fatal "Hi 1 foo" (fatal "Hi %d %s" 1 (reify Object (toString [_] "foo")))))