Skip to content

Commit

Permalink
[new] [#34] Add new signal-preamble-fn opts (@Knotschi)
Browse files Browse the repository at this point in the history
New opts:

  - `:format-id-fn`
  - `:format-msg-fn`

This way its easier to reuse signal-preamble-fn for custom handlers.
If nil is passed as any format fn: value won't be logged.
The `-` char before the msg is now part of the formatter fn.
  • Loading branch information
Knotschi authored and ptaoussanis committed Dec 22, 2024
1 parent 9dc9a46 commit 0822217
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions projects/main/src/taoensso/telemere/utils.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,14 @@
\"2024-03-26T11:14:51.806Z INFO EVENT Hostname taoensso.telemere(2,21) ::ev-id - msg\"
Options:
`:format-inst-fn` - (fn format [instant]) => string."
`:format-inst-fn` - (fn format [instant]) => string.
`:format-id-fn` - (fn format [ns id]) => string.
`:format-msg-fn` - (fn format [msg]) => string."
([] (signal-preamble-fn nil))
([{:keys [format-inst-fn]
:or {format-inst-fn (format-inst-fn)}}]
([{:keys [format-inst-fn format-id-fn format-msg-fn]
:or {format-inst-fn (format-inst-fn)
format-id-fn format-id
format-msg-fn (fn [msg] (str "- " msg))}}]

(fn signal-preamble [signal]
(let [{:keys [inst level kind ns id msg_]} signal
Expand All @@ -536,8 +540,10 @@
(when-let [c (get signal :column)] (s+ "," c))
(s+ ")"))))

(when id (s+spc (sigs/format-id ns id)))
(when-let [msg (force msg_)] (s+spc "- " msg))
(when id (when-let [ff format-id-fn] (s+spc (ff ns id))))
(enc/when-let [ff format-msg-fn
msg (force msg_)]
(s+spc (ff msg)))

(when-not (zero? (enc/sb-length sb))
(str sb))))))
Expand Down

0 comments on commit 0822217

Please sign in to comment.