Skip to content

Commit

Permalink
Re-enable all tests.
Browse files Browse the repository at this point in the history
Previously commented out due to agent tests failing on build machine for some unknown reason.
See http://groups.google.com/group/clojure-dev/browse_thread/thread/fde32342f3c006bd

Also tweaked logging.clj to remove unreachable branches exposed by coverage.
  • Loading branch information
ataggart committed Jun 5, 2017
1 parent 9a352f8 commit 9a13a65
Show file tree
Hide file tree
Showing 3 changed files with 273 additions and 324 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.classpath
.lein-failures
.lein-*
.nrepl-*
.project
.settings
bin
target
26 changes: 12 additions & 14 deletions src/main/clojure/clojure/tools/logging.clj
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
One can override the above by setting *force* to :direct or :agent; all
subsequent writes will be direct or via an agent, respectively."
[logger level throwable message]
(if (cond
(nil? *force*) (and (clojure.lang.LockingTransaction/isRunning)
(*tx-agent-levels* level))
(= *force* :agent) true
(= *force* :direct) false)
(if (case *force*
:agent true
:direct false
(and (clojure.lang.LockingTransaction/isRunning)
(*tx-agent-levels* level)))
(send-off *logging-agent*
(fn [_#] (impl/write! logger level throwable message)))
(impl/write! logger level throwable message))
Expand Down Expand Up @@ -201,15 +201,13 @@
; Implementation Notes:
; - no enabled? check before making writers since that may change later
(let [[logger-ns out-level err-level] (if (vector? arg)
arg
[arg :info :error])]
(if (and logger-ns (seq body))
`(binding [*out* (java.io.OutputStreamWriter.
(log-stream ~out-level ~logger-ns))
*err* (java.io.OutputStreamWriter.
(log-stream ~err-level ~logger-ns))]
~@body))))

arg
[arg :info :error])]
`(binding [*out* (java.io.OutputStreamWriter.
(log-stream ~out-level ~logger-ns))
*err* (java.io.OutputStreamWriter.
(log-stream ~err-level ~logger-ns))]
~@body)))

;; level-specific macros

Expand Down
Loading

0 comments on commit 9a13a65

Please sign in to comment.