diff --git a/deps.edn b/deps.edn index 02cc822b..5fddd8d3 100644 --- a/deps.edn +++ b/deps.edn @@ -45,7 +45,7 @@ hiccup/hiccup {:mvn/version "2.0.0-RC1"} rewrite-clj/rewrite-clj {:mvn/version "1.1.47"} selmer/selmer {:mvn/version "1.12.59"} - com.taoensso/timbre {:mvn/version "6.0.1"} + com.taoensso/timbre {:mvn/version "6.5.0"} org.clojure/tools.logging {:mvn/version "1.1.0"} org.clojure/data.priority-map {:mvn/version "1.1.0"} insn/insn {:mvn/version "0.5.2"} diff --git a/feature-logging/babashka/impl/logging.clj b/feature-logging/babashka/impl/logging.clj index c1a9d134..a8605d63 100644 --- a/feature-logging/babashka/impl/logging.clj +++ b/feature-logging/babashka/impl/logging.clj @@ -37,7 +37,7 @@ :keys [loc level msg-type args vargs config ?err ?base-data spying?] :or - {config `*config* + {config 'taoensso.timbre/*config* ?err :auto}}] (have [:or nil? sequential? symbol?] args) @@ -55,7 +55,7 @@ (let [vargs-form (or vargs (if (symbol? args) - `(enc/ensure-vec ~args) + `(taoensso.timbre/-ensure-vec ~args) `[ ~@args]))] ;; Note pre-resolved expansion @@ -120,7 +120,7 @@ {} (select-keys (ns-publics ns) ks))) -(def atomic-println @#'appenders/atomic-println) +(def atomic-println @#'enc/println-atomic) (defn println-appender "Returns a simple `println` appender for Clojure/Script. @@ -186,7 +186,8 @@ 'merge-config! (sci/copy-var merge-config! tns) 'set-level! (sci/copy-var set-level! tns) 'println-appender (sci/copy-var println-appender tns) - '-log-and-rethrow-errors (sci/copy-var -log-and-rethrow-errors tns))) + '-log-and-rethrow-errors (sci/copy-var -log-and-rethrow-errors tns) + '-ensure-vec (sci/copy-var enc/ensure-vec tns))) (def timbre-appenders-namespace (let [tan (sci/create-ns 'taoensso.timbre.appenders.core nil)] diff --git a/project.clj b/project.clj index baefd1fa..0b0fbcfe 100644 --- a/project.clj +++ b/project.clj @@ -74,7 +74,7 @@ :feature/selmer {:source-paths ["feature-selmer"] :dependencies [[selmer/selmer "1.12.59"]]} :feature/logging {:source-paths ["feature-logging"] - :dependencies [[com.taoensso/timbre "6.0.4"] + :dependencies [[com.taoensso/timbre "6.5.0"] [org.clojure/tools.logging "1.1.0"]]} :feature/priority-map {:source-paths ["feature-priority-map"] :dependencies [[org.clojure/data.priority-map "1.1.0"]]}