status-im/timbre
2
0
Fork 0
mirror of https://github.com/status-im/timbre.git synced 2025-02-19 15:14:12 +00:00
Code Issues Projects Releases Wiki Activity

[#116] Add :context key to appender data (@mikesperber)

Browse Source
This commit is contained in:
Peter Taoussanis 2015-07-17 19:01:01 +07:00
parent b37ace035e
commit 02531eb01f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -125,10 +125,9 @@ This is the biggest win over Java logging IMO. Here's `timbre/example-config` (a
:output-fn ; (fn [data]) -> formatted output string :output-fn ; (fn [data]) -> formatted output string
; (see `default-output-fn` for details) ; (see `default-output-fn` for details)
:context ; *context* value at log time (see `with-context`)
:profile-stats ; From `profile` macro :profile-stats ; From `profile` macro
Also incl. any `*context*` keys (see `with-context`).
MIDDLEWARE MIDDLEWARE
Middleware are simple (fn [data]) -> ?data fns (applied left->right) that Middleware are simple (fn [data]) -> ?data fns (applied left->right) that
transform the data map dispatched to appender fns. If any middleware returns transform the data map dispatched to appender fns. If any middleware returns

15
src/taoensso/timbre.cljx
View File

@ -96,10 +96,9 @@
:output-fn ; (fn [data]) -> formatted output string :output-fn ; (fn [data]) -> formatted output string
; (see `default-output-fn` for details) ; (see `default-output-fn` for details)
:context ; *context* value at log time (see `with-context`)
:profile-stats ; From `profile` macro :profile-stats ; From `profile` macro
Also incl. any `*context*` keys (see `with-context`).
MIDDLEWARE MIDDLEWARE
Middleware are simple (fn [data]) -> ?data fns (applied left->right) that Middleware are simple (fn [data]) -> ?data fns (applied left->right) that
transform the data map dispatched to appender fns. If any middleware returns transform the data map dispatched to appender fns. If any middleware returns
@ -298,8 +297,8 @@
) )
(def ^:dynamic *context* (def ^:dynamic *context*
"General-purpose dynamic logging context. Context will be merged into "General-purpose dynamic logging context. Context will be included in appender
appender data map at logging time." nil) data map at logging time." nil)
(defmacro with-context [context & body] `(binding [*context* ~context] ~@body)) (defmacro with-context [context & body] `(binding [*context* ~context] ~@body))
(declare get-hostname) (declare get-hostname)
@ -327,9 +326,13 @@
vargs*_ (delay (vsplit-err1 (force vargs_))) vargs*_ (delay (vsplit-err1 (force vargs_)))
?err_ (delay (get @vargs*_ 0)) ?err_ (delay (get @vargs*_ 0))
vargs_ (delay (get @vargs*_ 1)) vargs_ (delay (get @vargs*_ 1))
data (merge ?base-data *context* context *context*
data (merge ?base-data
;; No, better nest than merge (appenders may want to pass
;; along arb context w/o knowing context keys, etc.):
(when (map? context) context) ; DEPRECATED, for back compat
{:config config ; Entire config! {:config config ; Entire config!
;; :context *context* ; Extra destructure's a nuisance :context context
:instant instant :instant instant
:level level :level level
:?ns-str ?ns-str :?ns-str ?ns-str