From 3c638503aa689e662668aad4e9e8c37d87b0d64c Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Wed, 1 Jun 2011 09:31:19 -0700 Subject: [PATCH] TLOG-1: Fix wrong arity on logp calling log*. --- src/main/clojure/clojure/tools/logging.clj | 2 +- src/test/clojure/clojure/tools/test_logging.clj | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/main/clojure/clojure/tools/logging.clj b/src/main/clojure/clojure/tools/logging.clj index a6f3388..d002cff 100644 --- a/src/main/clojure/clojure/tools/logging.clj +++ b/src/main/clojure/clojure/tools/logging.clj @@ -106,7 +106,7 @@ (if (impl-enabled? log# ~level) (if (instance? Throwable ~x) ; type check only when enabled (log* log# ~level ~x (print-str ~@more)) - (log* log# ~level (print-str ~x ~@more))))))) + (log* log# ~level nil (print-str ~x ~@more))))))) (defmacro logf "Logs a message using a format string and args. Can optionally take a diff --git a/src/test/clojure/clojure/tools/test_logging.clj b/src/test/clojure/clojure/tools/test_logging.clj index 94c0ba5..0b3f40b 100644 --- a/src/test/clojure/clojure/tools/test_logging.clj +++ b/src/test/clojure/clojure/tools/test_logging.clj @@ -136,6 +136,15 @@ (is (false? @flag)))) ) +(deftest logp-msg-no-optimize + (let [a "foo" + b "bar"] + (log/logp :debug a b)) + (is (= ["clojure.tools.test-logging" + :debug + nil + "foo bar"] + (peek @*entries*)))) (deftest logp-msg1 (log/logp :debug "hello") -- 1.7.3.5