Fix EvalReader exception when *read-eval* is false (thanks ummels)

This commit is contained in:
Peter Taoussanis 2013-04-14 16:30:19 +07:00
parent 7935493a22
commit 0dc4951db7
1 changed files with 3 additions and 3 deletions

View File

@ -293,11 +293,11 @@
;;;; Define logging macros ;;;; Define logging macros
(defmacro logging-enabled? (defn logging-enabled?
"Returns true when current logging level is sufficient and current namespace "Returns true when current logging level is sufficient and current namespace
is unfiltered." is unfiltered."
[level] [level]
`(and (sufficient-level? ~level) (@ns-filter-cache ~*ns*))) (and (sufficient-level? level) (@ns-filter-cache *ns*)))
(defmacro log* (defmacro log*
"Prepares given arguments for, and then dispatches to all relevant "Prepares given arguments for, and then dispatches to all relevant
@ -313,7 +313,7 @@
{:level ~level {:level ~level
:error? (error-level? ~level) :error? (error-level? ~level)
:instant (Date.) :instant (Date.)
:ns (str ~*ns*) :ns ~(str *ns*)
:message (if has-throwable?# (or (first xs#) x1#) x1#) :message (if has-throwable?# (or (first xs#) x1#) x1#)
:more (if has-throwable?# :more (if has-throwable?#
(conj (vec (rest xs#)) (conj (vec (rest xs#))