status-im
/
timbre
mirror of https://github.com/status-im/timbre.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Misc hk

This commit is contained in:
Peter Taoussanis 2015-02-16 12:53:55 +07:00
parent fc92f7cd9c
commit 426b8774aa
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/taoensso/timbre.clj
View File

@ -2,7 +2,7 @@
{:author "Peter Taoussanis"} {:author "Peter Taoussanis"}
(:require [clojure.string :as str] (:require [clojure.string :as str]
[io.aviso.exception :as aviso-ex] [io.aviso.exception :as aviso-ex]
[taoensso.encore :as encore]) [taoensso.encore :as enc])
(:import [java.util Date Locale] (:import [java.util Date Locale]
[java.text SimpleDateFormat])) [java.text SimpleDateFormat]))
@ -177,9 +177,9 @@
(try (spit filename (str output "\n") :append true) (try (spit filename (str output "\n") :append true)
(catch java.io.IOException _))))}}}) (catch java.io.IOException _))))}}})
(encore/defonce* config (atom example-config)) (enc/defonce* config (atom example-config))
(defn set-config! [ks val] (swap! config assoc-in ks val)) (defn set-config! [ks val] (swap! config assoc-in ks val))
(defn merge-config! [& maps] (apply swap! config encore/merge-deep maps)) (defn merge-config! [& maps] (apply swap! config enc/merge-deep maps))
;;;; Appender-fn decoration ;;;; Appender-fn decoration
@ -227,11 +227,11 @@
;; Compile-time: ;; Compile-time:
(if-not rate-limit apfn (if-not rate-limit apfn
(let [[ncalls-limit window-ms] rate-limit (let [[ncalls-limit window-ms] rate-limit
limiter-any (encore/rate-limiter ncalls-limit window-ms) limiter-any (enc/rate-limiter ncalls-limit window-ms)
;; This is a little hand-wavy but it's a decent general ;; This is a little hand-wavy but it's a decent general
;; strategy and helps us from making this overly complex to ;; strategy and helps us from making this overly complex to
;; configure. ;; configure.
limiter-specific (encore/rate-limiter (quot ncalls-limit 4) limiter-specific (enc/rate-limiter (quot ncalls-limit 4)
window-ms)] window-ms)]
(fn [{:keys [ns args] :as apfn-args}] (fn [{:keys [ns args] :as apfn-args}]
;; Runtime: (test smaller limit 1st): ;; Runtime: (test smaller limit 1st):
@ -248,7 +248,7 @@
(send-off agent (fn [_] (apfn apfn-args))))))))))) (send-off agent (fn [_] (apfn apfn-args)))))))))))
(def ^:private get-hostname (def ^:private get-hostname
(encore/memoize* 60000 (enc/memoize* 60000
(fn [] (fn []
(-> (->
(future ; Android doesn't like this on the main thread (future ; Android doesn't like this on the main thread
@ -274,7 +274,7 @@
timestamp-fn timestamp-fn
(if-not timestamp-pattern (constantly nil) (if-not timestamp-pattern (constantly nil)
(fn [^Date dt] (fn [^Date dt]
(.format (encore/simple-date-format timestamp-pattern (.format (enc/simple-date-format timestamp-pattern
{:locale timestamp-locale}) dt)))] {:locale timestamp-locale}) dt)))]
(fn [juxtfn-args] (fn [juxtfn-args]