mirror of
https://github.com/taoensso/telemere.git
synced 2025-12-20 02:51:11 +00:00
[new] Add :incl-thread?, :incl-kvs? opts to format-signal->str-fn
This commit is contained in:
parent
c5333faa03
commit
9a514d1b43
1 changed files with 22 additions and 12 deletions
|
|
@ -493,7 +493,13 @@
|
||||||
Returns a (fn handle [signal handle-fn value-fn]) for internal use.
|
Returns a (fn handle [signal handle-fn value-fn]) for internal use.
|
||||||
Content equivalent to `format-signal->prelude-fn`."
|
Content equivalent to `format-signal->prelude-fn`."
|
||||||
([] (signal-content-handler nil))
|
([] (signal-content-handler nil))
|
||||||
([{:keys [format-nsecs-fn format-error-fn raw-error?]
|
([{:keys
|
||||||
|
[format-nsecs-fn
|
||||||
|
format-error-fn
|
||||||
|
raw-error?
|
||||||
|
incl-thread?
|
||||||
|
incl-kvs?]
|
||||||
|
|
||||||
:or
|
:or
|
||||||
{format-nsecs-fn (format-nsecs-fn) ; (fn [nanosecs])
|
{format-nsecs-fn (format-nsecs-fn) ; (fn [nanosecs])
|
||||||
format-error-fn (format-error-fn) ; (fn [error])
|
format-error-fn (format-error-fn) ; (fn [error])
|
||||||
|
|
@ -503,15 +509,14 @@
|
||||||
err-stop (str newline ">>> error >>>")]
|
err-stop (str newline ">>> error >>>")]
|
||||||
|
|
||||||
(fn a-signal-content-handler [signal hf vf]
|
(fn a-signal-content-handler [signal hf vf]
|
||||||
(let [{:keys [uid parent data #_kvs ctx #?(:clj thread) sample-rate]} signal]
|
(let [{:keys [uid parent data kvs ctx #?(:clj thread) sample-rate]} signal]
|
||||||
(when sample-rate (hf "sample: " (vf sample-rate)))
|
(when sample-rate (hf "sample: " (vf sample-rate)))
|
||||||
(when uid (hf " uid: " (vf uid)))
|
(when uid (hf " uid: " (vf uid)))
|
||||||
(when parent (hf "parent: " (vf parent)))
|
(when parent (hf "parent: " (vf parent)))
|
||||||
#?(:clj
|
#?(:clj (when (and thread incl-thread?) (hf "thread: " (vf thread))))
|
||||||
(when thread (hf "thread: " (vf thread))))
|
(when data (hf " data: " (vf data)))
|
||||||
(when data (hf " data: " (vf data)))
|
(when (and kvs incl-kvs?) (hf " kvs: " (vf kvs)))
|
||||||
#_(when kvs (hf " kvs: " (vf kvs))) ; Don't auto include in output
|
(when ctx (hf " ctx: " (vf ctx))))
|
||||||
(when ctx (hf " ctx: " (vf ctx))))
|
|
||||||
|
|
||||||
(let [{:keys [run-form error]} signal]
|
(let [{:keys [run-form error]} signal]
|
||||||
(when run-form
|
(when run-form
|
||||||
|
|
@ -604,7 +609,10 @@
|
||||||
([] (format-signal->str-fn nil))
|
([] (format-signal->str-fn nil))
|
||||||
([{:keys
|
([{:keys
|
||||||
[format-signal->prelude-fn
|
[format-signal->prelude-fn
|
||||||
format-nsecs-fn format-error-fn
|
format-nsecs-fn
|
||||||
|
format-error-fn
|
||||||
|
incl-thread?
|
||||||
|
incl-kvs?
|
||||||
end-with-newline?]
|
end-with-newline?]
|
||||||
|
|
||||||
:or
|
:or
|
||||||
|
|
@ -617,7 +625,9 @@
|
||||||
signal-content-handler ; (fn [signal hf vf]
|
signal-content-handler ; (fn [signal hf vf]
|
||||||
(signal-content-handler
|
(signal-content-handler
|
||||||
{:format-nsecs-fn format-nsecs-fn
|
{:format-nsecs-fn format-nsecs-fn
|
||||||
:format-error-fn format-error-fn})]
|
:format-error-fn format-error-fn
|
||||||
|
:incl-thread? incl-thread?
|
||||||
|
:incl-kvs? incl-kvs?})]
|
||||||
|
|
||||||
(fn format-signal->str [signal]
|
(fn format-signal->str [signal]
|
||||||
(let [sb (enc/str-builder)
|
(let [sb (enc/str-builder)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue