diff --git a/projects/main/src/taoensso/telemere/utils.cljc b/projects/main/src/taoensso/telemere/utils.cljc index 1ec1aed..6f897d6 100644 --- a/projects/main/src/taoensso/telemere/utils.cljc +++ b/projects/main/src/taoensso/telemere/utils.cljc @@ -508,7 +508,7 @@ Returns a (fn preamble [signal]) that: - Takes a Telemere signal (map). - Returns a signal preamble ?string like: - \"2024-03-26T11:14:51.806Z INFO EVENT Hostname taoensso.telemere(2,21) ::ev-id - msg\" + \"2024-03-26T11:14:51.806Z INFO EVENT Hostname taoensso.telemere(2,21) ::ev-id msg\" Options: `:format-inst-fn` - (fn format [instant]) => string. @@ -518,7 +518,7 @@ ([{: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))}}] + format-msg-fn identity}}] (fn signal-preamble [signal] (let [{:keys [inst level kind ns id msg_]} signal diff --git a/projects/main/test/taoensso/telemere_tests.cljc b/projects/main/test/taoensso/telemere_tests.cljc index d3ce885..7c846f8 100644 --- a/projects/main/test/taoensso/telemere_tests.cljc +++ b/projects/main/test/taoensso/telemere_tests.cljc @@ -852,7 +852,7 @@ (let [sig (with-sig :raw :trap (tel/event! ::ev-id {:inst t1, :msg ["a" "b"]})) preamble ((utils/signal-preamble-fn) sig)] ; "2024-06-09T21:15:20.170Z INFO EVENT taoensso.telemere-tests(592,35) ::ev-id" [(is (enc/str-starts-with? preamble "2024-01-01T01:01:01.110Z INFO EVENT")) - (is (enc/str-ends-with? preamble "::ev-id - a b")) + (is (enc/str-ends-with? preamble "::ev-id a b")) (is (string? (re-find #"taoensso.telemere-tests\(\d+,\d+\)" preamble)))])) (testing "pr-signal-fn" @@ -891,7 +891,7 @@ (testing "format-signal-fn" (let [sig (with-sig :raw :trap (tel/event! ::ev-id {:inst t1, :msg ["a" "b"]}))] [(is (enc/str-starts-with? ((tel/format-signal-fn) sig ) "2024-01-01T01:01:01.110Z INFO EVENT")) - (is (enc/str-ends-with? ((tel/format-signal-fn) (dissoc sig :host)) "::ev-id - a b\n"))]))])]) + (is (enc/str-ends-with? ((tel/format-signal-fn) (dissoc sig :host)) "::ev-id a b\n"))]))])]) ;;;; File handler