mirror of https://github.com/status-im/timbre.git
[#216] PR housekeeping
This commit is contained in:
parent
eb78de58c8
commit
05cd4a771b
|
@ -142,15 +142,18 @@
|
||||||
|
|
||||||
(if (or (:raw-console? data)
|
(if (or (:raw-console? data)
|
||||||
(get-in data [:?meta :raw-console?])) ; Undocumented
|
(get-in data [:?meta :raw-console?])) ; Undocumented
|
||||||
|
|
||||||
(let [output
|
(let [output
|
||||||
((:output-fn data)
|
((:output-fn data)
|
||||||
(assoc data
|
(assoc data
|
||||||
:msg_ ""
|
:msg_ ""
|
||||||
:?err nil))
|
:?err nil))
|
||||||
;; (<output> <raw-error> <raw-arg1> <raw-arg2> ...):
|
|
||||||
args (cond->> (:vargs data)
|
args ; (<output> ?<raw-error> <raw-arg1> <raw-arg2> ...)
|
||||||
(:?err data) (cons (:?err data))
|
(let [vargs (:vargs data)]
|
||||||
true (cons output))]
|
(if-let [err (:?err data)]
|
||||||
|
(cons output (cons err vargs))
|
||||||
|
(cons output vargs)))]
|
||||||
|
|
||||||
(.apply logger js/console (into-array args)))
|
(.apply logger js/console (into-array args)))
|
||||||
(.call logger js/console (force (:output_ data)))))))
|
(.call logger js/console (force (:output_ data)))))))
|
||||||
|
|
Loading…
Reference in New Issue