Fix wrong arity on logf calling log*.

clojure · Jul 6, 2011 · 32b7077 · 32b7077
1 parent 43cf4c6
commit 32b7077
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/clojure/clojure/tools/logging.clj b/src/main/clojure/clojure/tools/logging.clj
@@ -119,7 +119,7 @@
        (if (impl-enabled? logger# ~level)
          (if (instance? Throwable ~x) ; type check only when enabled
            (log* logger# ~level ~x (format ~@more))
-           (log* logger# ~level (format ~x ~@more)))))))
+           (log* logger# ~level nil (format ~x ~@more)))))))
 
 (defmacro enabled?
   "Returns true if the specific logging level is enabled.  Use of this function

diff --git a/src/test/clojure/clojure/tools/test_logging.clj b/src/test/clojure/clojure/tools/test_logging.clj
@@ -189,6 +189,16 @@
             "hello world"]
           (peek @*entries*)))))
 
+(deftest logf-msg-no-optimize
+  (let [a "foo %s"
+        b "bar"]
+    (logger/logf :debug a b))
+  (is (= ["clojure.tools.test-logging"
+          :debug
+          nil
+          "foo bar"]
+        (peek @*entries*))))
+
 (deftest logf-msg1
   (logger/logf :debug "hello")
   (is (= ["clojure.tools.test-logging"