From 3a9ffc62062c538ceb1492d1efb62fee4f139c33 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Tue, 31 Dec 2024 09:30:09 +0100 Subject: [PATCH] [fix] [#42] Timbre shim: rename `spy!` -> `spy` (@lvh) --- projects/main/src/taoensso/telemere/timbre.cljc | 12 ++++++------ projects/main/test/taoensso/telemere_tests.cljc | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/main/src/taoensso/telemere/timbre.cljc b/projects/main/src/taoensso/telemere/timbre.cljc index ec4573c..387bcaa 100644 --- a/projects/main/src/taoensso/telemere/timbre.cljc +++ b/projects/main/src/taoensso/telemere/timbre.cljc @@ -98,10 +98,10 @@ (defmacro reportf "Prefer `telemere/log!`, etc." [& args] (enc/keep-callsite `(log! :report true [~@args]))))) #?(:clj - (defmacro spy! + (defmacro spy "Prefer `telemere/spy!`." - ([ form] (enc/keep-callsite `(spy! :debug nil ~form))) - ([level form] (enc/keep-callsite `(spy! ~level nil ~form))) + ([ form] (enc/keep-callsite `(spy :debug nil ~form))) + ([level form] (enc/keep-callsite `(spy ~level nil ~form))) ([level form-name form] (let [location* (enc/get-source &form &env) msg @@ -121,9 +121,9 @@ ~form)))))) (comment - (:level (tel/with-signal (spy! (/ 1 0)))) - (select-keys (tel/with-signal (spy! :info #_"my-form-name" (+ 1 2))) [:level :msg_]) - (select-keys (tel/with-signal (spy! :info #_"my-form-name" (throw (Exception. "Ex")))) [:level :msg_])) + (:level (tel/with-signal (spy (/ 1 0)))) + (select-keys (tel/with-signal (spy :info #_"my-form-name" (+ 1 2))) [:level :msg_]) + (select-keys (tel/with-signal (spy :info #_"my-form-name" (throw (Exception. "Ex")))) [:level :msg_])) #?(:clj (defmacro log-errors "Prefer `telemere/catch->error!`." [& body] (enc/keep-callsite `(tel/catch->error! {:id shim-id, :catch-val nil} (do ~@body))))) #?(:clj (defmacro log-and-rethrow-errors "Prefer `telemere/catch->error!`." [& body] (enc/keep-callsite `(tel/catch->error! {:id shim-id} (do ~@body))))) diff --git a/projects/main/test/taoensso/telemere_tests.cljc b/projects/main/test/taoensso/telemere_tests.cljc index 4da33bc..16884b2 100644 --- a/projects/main/test/taoensso/telemere_tests.cljc +++ b/projects/main/test/taoensso/telemere_tests.cljc @@ -753,10 +753,10 @@ (is (sm? (with-sig (timbre/info ex1 "x1" "x2")) {:kind :log, :level :info, :error ex1, :msg_ "x1 x2", :data {:vargs ["x1" "x2"]}}) "First-arg error") - (is (sm? (with-sig (timbre/spy! :info "my-name" (+ 1 2))) {:kind :spy, :level :info, :id timbre/shim-id, :msg_ "my-name => 3", :ns pstr?})) - (is (sm? (tel/with-min-level :debug (with-sig (timbre/spy! (+ 1 2)))) {:kind :spy, :level :debug, :id timbre/shim-id, :msg_ "(+ 1 2) => 3", :ns pstr?})) + (is (sm? (with-sig (timbre/spy :info "my-name" (+ 1 2))) {:kind :spy, :level :info, :id timbre/shim-id, :msg_ "my-name => 3", :ns pstr?})) + (is (sm? (tel/with-min-level :debug (with-sig (timbre/spy (+ 1 2)))) {:kind :spy, :level :debug, :id timbre/shim-id, :msg_ "(+ 1 2) => 3", :ns pstr?})) - (let [{[sv1 sv2] :signals} (tel/with-min-level :debug (with-sigs (timbre/spy! (ex1!))))] + (let [{[sv1 sv2] :signals} (tel/with-min-level :debug (with-sigs (timbre/spy (ex1!))))] [(is (sm? sv1 {:kind :error, :level :error, :id timbre/shim-id, :msg_ nil, :error ex1, :ns pstr?})) (is (sm? sv2 {:kind :spy, :level :debug, :id timbre/shim-id, :msg_ pstr? :error ex1, :ns pstr?}))])