Fixes #11; log-ns is now captured at macro-expansion-time.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/clojure/contrib/logging.clj b/src/clojure/contrib/logging.clj
index ef49d1a8..7432b34b 100644
--- a/src/clojure/contrib/logging.clj
+++ b/src/clojure/contrib/logging.clj
@@ -178,7 +178,7 @@
   ([level message]
     `(log ~level ~message nil))
   ([level message throwable]
-    `(log ~level ~message ~throwable (str *ns*)))
+    `(log ~level ~message ~throwable ~(str *ns*)))
   ([level message throwable log-ns]
     `(if (and @*allow-direct-logging*
               (not (clojure.lang.LockingTransaction/isRunning)))
@@ -187,15 +187,15 @@
           do-log ~level (delay ~message) ~throwable ~log-ns))))
 
 
-(defn enabled?
+(defmacro enabled?
   "Returns true if the specific logging level is enabled.  Use of this function
   should only be necessary if one needs to execute alternate code paths beyond
   whether the log should be written to."
   ([level]
-    (enabled? level (str *ns*)))
+    `(enabled? ~level ~(str *ns*)))
   ([level log-ns]
-    (let [sys @*log-system*]
-      ((sys :enabled?) ((sys :get-log) log-ns) level))))
+    `(let [sys# @*log-system*]
+      ((sys# :enabled?) ((sys# :get-log) ~log-ns) ~level))))
 
 
 (defmacro spy