diff --git a/src/taoensso/telemere/impl.cljc b/src/taoensso/telemere/impl.cljc index 59af48c..3f17376 100644 --- a/src/taoensso/telemere/impl.cljc +++ b/src/taoensso/telemere/impl.cljc @@ -39,10 +39,10 @@ :id-filter (or id-filter (get base :id-filter)) :min-level (or min-level (get base :min-level))})))) -(let [base (enc/get-env {:as :edn} :taoensso.telemere/rt-filters<.platform><.edn>) - ns-filter (enc/get-env {:as :edn} :taoensso.telemere/rt-ns-filter<.platform><.edn>) - id-filter (enc/get-env {:as :edn} :taoensso.telemere/rt-id-filter<.platform><.edn>) - min-level (enc/get-env {:as :edn} :taoensso.telemere/rt-min-level<.platform><.edn>)] +(let [base (enc/get-env {:as :edn} :taoensso.telemere/rt-filters<.platform><.edn>) + ns-filter (enc/get-env {:as :edn} :taoensso.telemere/rt-ns-filter<.platform><.edn>) + id-filter (enc/get-env {:as :edn} :taoensso.telemere/rt-id-filter<.platform><.edn>) + min-level (enc/get-env {:as :edn, :default :info} :taoensso.telemere/rt-min-level<.platform><.edn>)] (enc/defonce ^:dynamic *rt-sig-filter* "`SigFilter` used for runtime filtering, or nil." diff --git a/test/taoensso/telemere_tests.cljc b/test/taoensso/telemere_tests.cljc index ed4ad19..910ade3 100644 --- a/test/taoensso/telemere_tests.cljc +++ b/test/taoensso/telemere_tests.cljc @@ -40,14 +40,22 @@ (def pstr? (enc/pred string?)) (def pnat-int? (enc/pred enc/nat-int?))) -(let [sig-handlers_ (atom nil)] +(let [rt-sig-filter_ (atom nil) + sig-handlers_ (atom nil)] + (test/use-fixtures :once (enc/test-fixtures - {:after (fn [] (enc/set-var-root! impl/*sig-handlers* @sig-handlers_)) - :before + {:before (fn [] - (reset! sig-handlers_ impl/*sig-handlers*) - (enc/set-var-root! impl/*sig-handlers* nil))}))) + (reset! rt-sig-filter_ impl/*rt-sig-filter*) + (reset! sig-handlers_ impl/*sig-handlers*) + (enc/set-var-root! impl/*sig-handlers* nil) + (enc/set-var-root! impl/*rt-sig-filter* nil)) + + :after + (fn [] + (enc/set-var-root! impl/*rt-sig-filter* @rt-sig-filter_) + (enc/set-var-root! impl/*sig-handlers* @sig-handlers_))}))) ;;;; @@ -586,11 +594,11 @@ ;;;; Timbre shim (deftest _timbre-shim - [(is (sm? (with-sig (timbre/log :debug "x1" nil "x2")) {:kind :log, :level :debug, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?})) + [(is (sm? (with-sig (timbre/log :warn "x1" nil "x2")) {:kind :log, :level :warn, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?})) (is (sm? (with-sig (timbre/info "x1" nil "x2")) {:kind :log, :level :info, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?})) (is (sm? (with-sig (timbre/error "x1" nil "x2")) {:kind :log, :level :error, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?})) - (is (sm? (with-sig (timbre/logf :debug "%s %s %s" "x1" nil "x2")) {:kind :log, :level :debug, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?})) + (is (sm? (with-sig (timbre/logf :warn "%s %s %s" "x1" nil "x2")) {:kind :log, :level :warn, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?})) (is (sm? (with-sig (timbre/infof "%s %s %s" "x1" nil "x2")) {:kind :log, :level :info, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?})) (is (sm? (with-sig (timbre/errorf "%s %s %s" "x1" nil "x2")) {:kind :log, :level :error, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns pstr?}))