mirror of
https://github.com/taoensso/telemere.git
synced 2025-12-17 09:51:12 +00:00
[fix] Timbre->Telemere appender: don't duplicate output formatting
Some checks are pending
Clj tests / tests (17, ubuntu-latest) (push) Waiting to run
Clj tests / tests (19, ubuntu-latest) (push) Waiting to run
Clj tests / tests (21, ubuntu-latest) (push) Waiting to run
Cljs tests / tests (21, ubuntu-latest) (push) Waiting to run
Graal tests / tests (17, macOS-latest) (push) Waiting to run
Graal tests / tests (17, ubuntu-latest) (push) Waiting to run
Graal tests / tests (17, windows-latest) (push) Waiting to run
Some checks are pending
Clj tests / tests (17, ubuntu-latest) (push) Waiting to run
Clj tests / tests (19, ubuntu-latest) (push) Waiting to run
Clj tests / tests (21, ubuntu-latest) (push) Waiting to run
Cljs tests / tests (21, ubuntu-latest) (push) Waiting to run
Graal tests / tests (17, macOS-latest) (push) Waiting to run
Graal tests / tests (17, ubuntu-latest) (push) Waiting to run
Graal tests / tests (17, windows-latest) (push) Waiting to run
BEFORE this commit: The Timbre->Telemere appender produced duplicate preamble output (timestamp, namespace, etc.). Both Timbre AND Telemere were adding preamble info. AFTER this commit: Now ONLY Telemere adds preamble info. Timbre's `:output-fn` is ignored.
This commit is contained in:
parent
c99fd044b4
commit
3ea81df34f
1 changed files with 8 additions and 4 deletions
|
|
@ -190,8 +190,11 @@
|
||||||
:min-level nil
|
:min-level nil
|
||||||
:fn
|
:fn
|
||||||
(fn [data]
|
(fn [data]
|
||||||
(let [{:keys [instant level context ?err output_
|
(let [{:keys [instant level context msg-type vargs
|
||||||
?ns-str ?file ?line ?column]} data]
|
?ns-str ?file ?line ?column]} data
|
||||||
|
|
||||||
|
format-msg? (enc/identical-kw? msg-type :f)
|
||||||
|
[error msg vargs] (parse-vargs format-msg? vargs)]
|
||||||
|
|
||||||
(taoensso.telemere/signal!
|
(taoensso.telemere/signal!
|
||||||
{:kind :timbre
|
{:kind :timbre
|
||||||
|
|
@ -203,5 +206,6 @@
|
||||||
:coords (when ?line [?line ?column])
|
:coords (when ?line [?line ?column])
|
||||||
:file ?file ; Non-standard, goes to kvs
|
:file ?file ; Non-standard, goes to kvs
|
||||||
|
|
||||||
:error ?err
|
:error error
|
||||||
:msg (force output_)})))})
|
:msg msg
|
||||||
|
:timbre/vargs vargs})))})
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue