mirror of
https://github.com/status-im/timbre.git
synced 2025-02-11 11:16:31 +00:00
Merge pull request #13 from emlyn/master
Add per-appender prefix functions (thanks Emlyn)
This commit is contained in:
commit
84631ad0ae
@ -132,10 +132,18 @@
|
|||||||
(defn- wrap-appender-fn
|
(defn- wrap-appender-fn
|
||||||
"Wraps compile-time appender fn with additional runtime capabilities
|
"Wraps compile-time appender fn with additional runtime capabilities
|
||||||
controlled by compile-time config."
|
controlled by compile-time config."
|
||||||
[{apfn :fn :keys [async? max-message-per-msecs] :as appender}]
|
[{apfn :fn :keys [async? max-message-per-msecs prefix-fn] :as appender}]
|
||||||
(->> ; Wrapping applies capabilities bottom-to-top
|
(->> ; Wrapping applies capabilities bottom-to-top
|
||||||
apfn
|
apfn
|
||||||
|
|
||||||
|
;; Wrap for per-appender prefix-fn support
|
||||||
|
((fn [apfn]
|
||||||
|
(if-not prefix-fn
|
||||||
|
apfn
|
||||||
|
(fn [apfn-args]
|
||||||
|
(apfn (assoc apfn-args
|
||||||
|
:prefix (prefix-fn apfn-args)))))))
|
||||||
|
|
||||||
;; Wrap for runtime flood-safety support
|
;; Wrap for runtime flood-safety support
|
||||||
((fn [apfn]
|
((fn [apfn]
|
||||||
(if-not max-message-per-msecs
|
(if-not max-message-per-msecs
|
||||||
|
@ -32,9 +32,7 @@
|
|||||||
(when-let [irc-config (:irc ap-config)]
|
(when-let [irc-config (:irc ap-config)]
|
||||||
(send-message
|
(send-message
|
||||||
(assoc irc-config
|
(assoc irc-config
|
||||||
:prefix (if-let [prefix-fn (:prefix-fn irc-config)]
|
:prefix prefix
|
||||||
(prefix-fn prefix)
|
|
||||||
prefix)
|
|
||||||
:message message))))
|
:message message))))
|
||||||
|
|
||||||
(def irc-appender
|
(def irc-appender
|
||||||
@ -44,4 +42,5 @@
|
|||||||
:name \"My Logger\" :chan \"#logs\"")
|
:name \"My Logger\" :chan \"#logs\"")
|
||||||
:min-level :info :enabled? true :async? false
|
:min-level :info :enabled? true :async? false
|
||||||
:max-message-per-msecs nil ; no rate limit by default
|
:max-message-per-msecs nil ; no rate limit by default
|
||||||
|
:prefix-fn (fn [{:keys [level]}] (-> level name str/upper-case))
|
||||||
:fn appender-fn})
|
:fn appender-fn})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user