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

v4.7.3 (syncing deps)

This commit is contained in:
Peter Taoussanis 2016-07-24 11:31:31 +07:00
parent 757c6f6b1f
commit 97df46c6b3
6 changed files with 149 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitignore vendored
View File

@ -1,13 +1,14 @@
/target/ pom.xml*
.lein*
.nrepl-port
*.jar
*.class
.env
.DS_Store
/lib/ /lib/
/classes/ /classes/
/target/
/checkouts/ /checkouts/
/logs/ /logs/
/docs/ /docs/
/doc/ /doc/
/*.jar
/*.class
/.lein*
/pom.xml*
/.env
.DS_Store

187
LICENSE
View File

@ -15,12 +15,12 @@ b) in the case of each subsequent Contributor:
ii) additions to the Program; ii) additions to the Program;
where such changes and/or additions to the Program originate from and are where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from distributed by that particular Contributor. A Contribution 'originates'
a Contributor if it was added to the Program by such Contributor itself or from a Contributor if it was added to the Program by such Contributor
anyone acting on such Contributor's behalf. Contributions do not include itself or anyone acting on such Contributor's behalf. Contributions do not
additions to the Program which: (i) are separate modules of software include additions to the Program which: (i) are separate modules of
distributed in conjunction with the Program under their own license software distributed in conjunction with the Program under their own
agreement, and (ii) are not derivative works of the Program. license agreement, and (ii) are not derivative works of the Program.
"Contributor" means any person or entity that distributes the Program. "Contributor" means any person or entity that distributes the Program.
@ -28,7 +28,8 @@ b) in the case of each subsequent Contributor:
necessarily infringed by the use or sale of its Contribution alone or when necessarily infringed by the use or sale of its Contribution alone or when
combined with the Program. combined with the Program.
"Program" means the Contributions distributed in accordance with this Agreement. "Program" means the Contributions distributed in accordance with this
Agreement.
"Recipient" means anyone who receives the Program under this Agreement, "Recipient" means anyone who receives the Program under this Agreement,
including all Contributors. including all Contributors.
@ -36,51 +37,51 @@ including all Contributors.
2. GRANT OF RIGHTS 2. GRANT OF RIGHTS
a) Subject to the terms of this Agreement, each Contributor hereby grants a) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free copyright license to Recipient a non-exclusive, worldwide, royalty-free copyright license to
reproduce, prepare derivative works of, publicly display, publicly perform, reproduce, prepare derivative works of, publicly display, publicly
distribute and sublicense the Contribution of such Contributor, if any, and perform, distribute and sublicense the Contribution of such Contributor,
such derivative works, in source code and object code form. if any, and such derivative works, in source code and object code form.
b) Subject to the terms of this Agreement, each Contributor hereby grants b) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free patent license under Recipient a non-exclusive, worldwide, royalty-free patent license under
Licensed Patents to make, use, sell, offer to sell, import and otherwise Licensed Patents to make, use, sell, offer to sell, import and otherwise
transfer the Contribution of such Contributor, if any, in source code and transfer the Contribution of such Contributor, if any, in source code and
object code form. This patent license shall apply to the combination of the object code form. This patent license shall apply to the combination of
Contribution and the Program if, at the time the Contribution is added by the Contribution and the Program if, at the time the Contribution is
the Contributor, such addition of the Contribution causes such combination added by the Contributor, such addition of the Contribution causes such
to be covered by the Licensed Patents. The patent license shall not apply combination to be covered by the Licensed Patents. The patent license
to any other combinations which include the Contribution. No hardware per shall not apply to any other combinations which include the Contribution.
se is licensed hereunder. No hardware per se is licensed hereunder.
c) Recipient understands that although each Contributor grants the licenses to c) Recipient understands that although each Contributor grants the licenses
its Contributions set forth herein, no assurances are provided by any to its Contributions set forth herein, no assurances are provided by any
Contributor that the Program does not infringe the patent or other Contributor that the Program does not infringe the patent or other
intellectual property rights of any other entity. Each Contributor intellectual property rights of any other entity. Each Contributor
disclaims any liability to Recipient for claims brought by any other entity disclaims any liability to Recipient for claims brought by any other
based on infringement of intellectual property rights or otherwise. As a entity based on infringement of intellectual property rights or
condition to exercising the rights and licenses granted hereunder, each otherwise. As a condition to exercising the rights and licenses granted
Recipient hereby assumes sole responsibility to secure any other hereunder, each Recipient hereby assumes sole responsibility to secure
intellectual property rights needed, if any. For example, if a third party any other intellectual property rights needed, if any. For example, if a
patent license is required to allow Recipient to distribute the Program, it third party patent license is required to allow Recipient to distribute
is Recipient's responsibility to acquire that license before distributing the Program, it is Recipient's responsibility to acquire that license
the Program. before distributing the Program.
d) Each Contributor represents that to its knowledge it has sufficient d) Each Contributor represents that to its knowledge it has sufficient
copyright rights in its Contribution, if any, to grant the copyright copyright rights in its Contribution, if any, to grant the copyright
license set forth in this Agreement. license set forth in this Agreement.
3. REQUIREMENTS 3. REQUIREMENTS
A Contributor may choose to distribute the Program in object code form under its A Contributor may choose to distribute the Program in object code form under
own license agreement, provided that: its own license agreement, provided that:
a) it complies with the terms and conditions of this Agreement; and a) it complies with the terms and conditions of this Agreement; and
b) its license agreement: b) its license agreement:
i) effectively disclaims on behalf of all Contributors all warranties and i) effectively disclaims on behalf of all Contributors all warranties
conditions, express and implied, including warranties or conditions of and conditions, express and implied, including warranties or
title and non-infringement, and implied warranties or conditions of conditions of title and non-infringement, and implied warranties or
merchantability and fitness for a particular purpose; conditions of merchantability and fitness for a particular purpose;
ii) effectively excludes on behalf of all Contributors all liability for ii) effectively excludes on behalf of all Contributors all liability for
damages, including direct, indirect, special, incidental and damages, including direct, indirect, special, incidental and
consequential damages, such as lost profits; consequential damages, such as lost profits;
iii) states that any provisions which differ from this Agreement are offered iii) states that any provisions which differ from this Agreement are
by that Contributor alone and not by any other party; and offered by that Contributor alone and not by any other party; and
iv) states that source code for the Program is available from such iv) states that source code for the Program is available from such
Contributor, and informs licensees how to obtain it in a reasonable Contributor, and informs licensees how to obtain it in a reasonable
manner on or through a medium customarily used for software exchange. manner on or through a medium customarily used for software exchange.
@ -89,10 +90,11 @@ When the Program is made available in source code form:
a) it must be made available under this Agreement; and a) it must be made available under this Agreement; and
b) a copy of this Agreement must be included with each copy of the Program. b) a copy of this Agreement must be included with each copy of the Program.
Contributors may not remove or alter any copyright notices contained within Contributors may not remove or alter any copyright notices contained
the Program. within the Program.
Each Contributor must identify itself as the originator of its Contribution, if Each Contributor must identify itself as the originator of its Contribution,
if
any, in a manner that reasonably allows subsequent Recipients to identify the any, in a manner that reasonably allows subsequent Recipients to identify the
originator of the Contribution. originator of the Contribution.
@ -102,31 +104,32 @@ Commercial distributors of software may accept certain responsibilities with
respect to end users, business partners and the like. While this license is respect to end users, business partners and the like. While this license is
intended to facilitate the commercial use of the Program, the Contributor who intended to facilitate the commercial use of the Program, the Contributor who
includes the Program in a commercial product offering should do so in a manner includes the Program in a commercial product offering should do so in a manner
which does not create potential liability for other Contributors. Therefore, if which does not create potential liability for other Contributors. Therefore,
a Contributor includes the Program in a commercial product offering, such if a Contributor includes the Program in a commercial product offering, such
Contributor ("Commercial Contributor") hereby agrees to defend and indemnify Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
every other Contributor ("Indemnified Contributor") against any losses, damages every other Contributor ("Indemnified Contributor") against any losses,
and costs (collectively "Losses") arising from claims, lawsuits and other legal damages and costs (collectively "Losses") arising from claims, lawsuits and
actions brought by a third party against the Indemnified Contributor to the other legal actions brought by a third party against the Indemnified
extent caused by the acts or omissions of such Commercial Contributor in Contributor to the extent caused by the acts or omissions of such Commercial
connection with its distribution of the Program in a commercial product Contributor in connection with its distribution of the Program in a commercial
offering. The obligations in this section do not apply to any claims or Losses product offering. The obligations in this section do not apply to any claims
relating to any actual or alleged intellectual property infringement. In order or Losses relating to any actual or alleged intellectual property
to qualify, an Indemnified Contributor must: a) promptly notify the Commercial infringement. In order to qualify, an Indemnified Contributor must:
Contributor in writing of such claim, and b) allow the Commercial Contributor to a) promptly notify the Commercial Contributor in writing of such claim, and
control, and cooperate with the Commercial Contributor in, the defense and any b) allow the Commercial Contributor to control, and cooperate with the
related settlement negotiations. The Indemnified Contributor may participate in Commercial Contributor in, the defense and any related settlement
any such claim at its own expense. negotiations. The Indemnified Contributor may participate in any such claim at
its own expense.
For example, a Contributor might include the Program in a commercial product For example, a Contributor might include the Program in a commercial product
offering, Product X. That Contributor is then a Commercial Contributor. If that offering, Product X. That Contributor is then a Commercial Contributor. If
Commercial Contributor then makes performance claims, or offers warranties that Commercial Contributor then makes performance claims, or offers
related to Product X, those performance claims and warranties are such warranties related to Product X, those performance claims and warranties are
Commercial Contributor's responsibility alone. Under this section, the such Commercial Contributor's responsibility alone. Under this section, the
Commercial Contributor would have to defend claims against the other Commercial Contributor would have to defend claims against the other
Contributors related to those performance claims and warranties, and if a court Contributors related to those performance claims and warranties, and if a
requires any other Contributor to pay any damages as a result, the Commercial court requires any other Contributor to pay any damages as a result, the
Contributor must pay those damages. Commercial Contributor must pay those damages.
5. NO WARRANTY 5. NO WARRANTY
@ -134,35 +137,37 @@ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
Recipient is solely responsible for determining the appropriateness of using and Recipient is solely responsible for determining the appropriateness of using
distributing the Program and assumes all risks associated with its exercise of and distributing the Program and assumes all risks associated with its
rights under this Agreement , including but not limited to the risks and costs exercise of rights under this Agreement , including but not limited to the
of program errors, compliance with applicable laws, damage to or loss of data, risks and costs of program errors, compliance with applicable laws, damage to
programs or equipment, and unavailability or interruption of operations. or loss of data, programs or equipment, and unavailability or interruption of
operations.
6. DISCLAIMER OF LIABILITY 6. DISCLAIMER OF LIABILITY
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGES.
7. GENERAL 7. GENERAL
If any provision of this Agreement is invalid or unenforceable under applicable If any provision of this Agreement is invalid or unenforceable under
law, it shall not affect the validity or enforceability of the remainder of the applicable law, it shall not affect the validity or enforceability of the
terms of this Agreement, and without further action by the parties hereto, such remainder of the terms of this Agreement, and without further action by the
provision shall be reformed to the minimum extent necessary to make such parties hereto, such provision shall be reformed to the minimum extent
provision valid and enforceable. necessary to make such provision valid and enforceable.
If Recipient institutes patent litigation against any entity (including a If Recipient institutes patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Program itself cross-claim or counterclaim in a lawsuit) alleging that the Program itself
(excluding combinations of the Program with other software or hardware) (excluding combinations of the Program with other software or hardware)
infringes such Recipient's patent(s), then such Recipient's rights granted under infringes such Recipient's patent(s), then such Recipient's rights granted
Section 2(b) shall terminate as of the date such litigation is filed. under Section 2(b) shall terminate as of the date such litigation is filed.
All Recipient's rights under this Agreement shall terminate if it fails to All Recipient's rights under this Agreement shall terminate if it fails to
comply with any of the material terms or conditions of this Agreement and does comply with any of the material terms or conditions of this Agreement and does
@ -170,26 +175,26 @@ not cure such failure in a reasonable period of time after becoming aware of
such noncompliance. If all Recipient's rights under this Agreement terminate, such noncompliance. If all Recipient's rights under this Agreement terminate,
Recipient agrees to cease use and distribution of the Program as soon as Recipient agrees to cease use and distribution of the Program as soon as
reasonably practicable. However, Recipient's obligations under this Agreement reasonably practicable. However, Recipient's obligations under this Agreement
and any licenses granted by Recipient relating to the Program shall continue and and any licenses granted by Recipient relating to the Program shall continue
survive. and survive.
Everyone is permitted to copy and distribute copies of this Agreement, but in Everyone is permitted to copy and distribute copies of this Agreement, but in
order to avoid inconsistency the Agreement is copyrighted and may only be order to avoid inconsistency the Agreement is copyrighted and may only be
modified in the following manner. The Agreement Steward reserves the right to modified in the following manner. The Agreement Steward reserves the right to
publish new versions (including revisions) of this Agreement from time to time. publish new versions (including revisions) of this Agreement from time to
No one other than the Agreement Steward has the right to modify this Agreement. time. No one other than the Agreement Steward has the right to modify this
The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation Agreement. The Eclipse Foundation is the initial Agreement Steward. The
may assign the responsibility to serve as the Agreement Steward to a suitable Eclipse Foundation may assign the responsibility to serve as the Agreement
separate entity. Each new version of the Agreement will be given a Steward to a suitable separate entity. Each new version of the Agreement will
distinguishing version number. The Program (including Contributions) may always be given a distinguishing version number. The Program (including
be distributed subject to the version of the Agreement under which it was Contributions) may always be distributed subject to the version of the
received. In addition, after a new version of the Agreement is published, Agreement under which it was received. In addition, after a new version of the
Contributor may elect to distribute the Program (including its Contributions) Agreement is published, Contributor may elect to distribute the Program
under the new version. Except as expressly stated in Sections 2(a) and 2(b) (including its Contributions) under the new version. Except as expressly
above, Recipient receives no rights or licenses to the intellectual property of stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
any Contributor under this Agreement, whether expressly, by implication, licenses to the intellectual property of any Contributor under this Agreement,
estoppel or otherwise. All rights in the Program not expressly granted under whether expressly, by implication, estoppel or otherwise. All rights in the
this Agreement are reserved. Program not expressly granted under this Agreement are reserved.
This Agreement is governed by the laws of the State of New York and the This Agreement is governed by the laws of the State of New York and the
intellectual property laws of the United States of America. No party to this intellectual property laws of the United States of America. No party to this

12
project.clj
View File

@ -1,4 +1,4 @@
(defproject com.taoensso/timbre "4.7.0" (defproject com.taoensso/timbre "4.7.3"
:author "Peter Taoussanis <https://www.taoensso.com>" :author "Peter Taoussanis <https://www.taoensso.com>"
:description "Pure Clojure/Script logging library" :description "Pure Clojure/Script logging library"
:url "https://github.com/ptaoussanis/timbre" :url "https://github.com/ptaoussanis/timbre"
@ -12,8 +12,8 @@
:dependencies :dependencies
[[org.clojure/clojure "1.5.1"] [[org.clojure/clojure "1.5.1"]
[com.taoensso/encore "2.64.1"] [com.taoensso/encore "2.67.2"]
[io.aviso/pretty "0.1.28"]] [io.aviso/pretty "0.1.29"]]
:plugins :plugins
[[lein-pprint "1.1.2"] [[lein-pprint "1.1.2"]
@ -33,16 +33,16 @@
[[org.clojure/tools.logging "0.3.1"] [[org.clojure/tools.logging "0.3.1"]
;;; Appender deps ;;; Appender deps
[com.taoensso/nippy "2.11.1"] [com.taoensso/nippy "2.12.0"]
[com.taoensso/carmine "2.13.1"] [com.taoensso/carmine "2.13.1"]
[com.draines/postal "2.0.0"] [com.draines/postal "2.0.1"]
[irclj "0.5.0-alpha4"] [irclj "0.5.0-alpha4"]
[org.graylog2/gelfclient "1.4.0" :exclusions [com.fasterxml.jackson.core/jackson-core]] [org.graylog2/gelfclient "1.4.0" :exclusions [com.fasterxml.jackson.core/jackson-core]]
[org.julienxx/clj-slack "0.5.4"] [org.julienxx/clj-slack "0.5.4"]
[org.clojure/java.jdbc "0.6.1"] [org.clojure/java.jdbc "0.6.1"]
[com.mchange/c3p0 "0.9.5.2"] [com.mchange/c3p0 "0.9.5.2"]
[cheshire "5.6.3"] [cheshire "5.6.3"]
[com.newrelic.agent.java/newrelic-agent "3.30.0"]]} [com.newrelic.agent.java/newrelic-agent "3.30.1"]]}
:dev :dev
[:1.9 :test :server-jvm [:1.9 :test :server-jvm

124
src/taoensso/timbre.cljx
View File

@ -5,21 +5,22 @@
(:require (:require
[clojure.string :as str] [clojure.string :as str]
[io.aviso.exception :as aviso-ex] [io.aviso.exception :as aviso-ex]
[taoensso.encore :as enc :refer (compile-if have have? qb)] [taoensso.encore :as enc :refer (have have? qb)]
[taoensso.timbre.appenders.core :as core-appenders]) [taoensso.timbre.appenders.core :as core-appenders])
#+cljs #+cljs
(:require (:require
[clojure.string :as str] [clojure.string :as str]
[taoensso.encore :as enc :refer () :refer-macros (compile-if have have?)] [taoensso.encore :as enc :refer () :refer-macros (have have?)]
[taoensso.timbre.appenders.core :as core-appenders]) [taoensso.timbre.appenders.core :as core-appenders])
#+cljs #+cljs
(:require-macros [taoensso.timbre :as timbre-macros :refer ()])) (:require-macros
[taoensso.timbre :as timbre-macros :refer ()]))
(if (vector? taoensso.encore/encore-version) (if (vector? taoensso.encore/encore-version)
(enc/assert-min-encore-version [2 58 0]) (enc/assert-min-encore-version [2 67 2])
(enc/assert-min-encore-version 2.58)) (enc/assert-min-encore-version 2.67))
;;;; Config ;;;; Config
@ -133,7 +134,7 @@
(set-config! example-config) (set-config! example-config)
(infof "Hello %s" "world :-)")) (infof "Hello %s" "world :-)"))
(enc/defonce* ^:dynamic *config* "See `example-config` for info." example-config) (enc/defonce ^:dynamic *config* "See `example-config` for info." example-config)
(defmacro with-config [config & body] `(binding [*config* ~config] ~@body)) (defmacro with-config [config & body] `(binding [*config* ~config] ~@body))
(defmacro with-merged-config [config & body] (defmacro with-merged-config [config & body]
`(binding [*config* (enc/nested-merge *config* ~config)] ~@body)) `(binding [*config* (enc/nested-merge *config* ~config)] ~@body))
@ -172,67 +173,7 @@
;;;; Namespace filtering ;;;; Namespace filtering
;; Code shared with Tufte (def ^:private -compile-ns-filter (enc/memoize_ enc/compile-ns-filter))
(def compile-ns-filter "Returns (fn [?ns]) -> truthy."
(let [compile1
(fn [x] ; ns-pattern
(cond
(enc/re-pattern? x) (fn [ns-str] (re-find x ns-str))
(string? x)
(if (enc/str-contains? x "*")
(let [re
(re-pattern
(-> (str "^" x "$")
(str/replace "." "\\.")
(str/replace "*" "(.*)")))]
(fn [ns-str] (re-find re ns-str)))
(fn [ns-str] (= ns-str x)))
:else (throw (ex-info "Unexpected ns-pattern type"
{:given x :type (type x)}))))]
(fn self
([ns-pattern] ; Useful for user-level matching
(let [x ns-pattern]
(cond
(map? x) (self (:whitelist x) (:blacklist x))
(or (vector? x) (set? x)) (self x nil)
(= x "*") (fn [?ns] true)
:else
(let [match? (compile1 x)]
(fn [?ns] (if (match? (str ?ns)) true))))))
([whitelist blacklist]
(let [white
(when (seq whitelist)
(let [match-fns (mapv compile1 whitelist)
[m1 & mn] match-fns]
(if mn
(fn [ns-str] (enc/rsome #(% ns-str) match-fns))
(fn [ns-str] (m1 ns-str)))))
black
(when (seq blacklist)
(let [match-fns (mapv compile1 blacklist)
[m1 & mn] match-fns]
(if mn
(fn [ns-str] (not (enc/rsome #(% ns-str) match-fns)))
(fn [ns-str] (not (m1 ns-str))))))]
(cond
(and white black)
(fn [?ns]
(let [ns-str (str ?ns)]
(if (white ns-str)
(if (black ns-str)
true))))
white (fn [?ns] (if (white (str ?ns)) true))
black (fn [?ns] (if (black (str ?ns)) true))
:else (fn [?ns] true) ; Common case
))))))
(def ^:private -compile-ns-filter (enc/memoize_ compile-ns-filter))
(def ^:private ns-filter (def ^:private ns-filter
"Returns true iff given ns passes white/black lists." "Returns true iff given ns passes white/black lists."
(enc/memoize_ (enc/memoize_
@ -282,7 +223,7 @@
(not (string? ns-str-form)) ; Not a compile-time ns-str const (not (string? ns-str-form)) ; Not a compile-time ns-str const
(compile-time-ns-filter ns-str-form))))) (compile-time-ns-filter ns-str-form)))))
(defn may-log? (defn #+clj may-log? #+cljs ^boolean may-log?
"Runtime check: would Timbre currently log at the given logging level? "Runtime check: would Timbre currently log at the given logging level?
* `?ns-str` arg required to support ns filtering * `?ns-str` arg required to support ns filtering
* `config` arg required to support non-global config" * `config` arg required to support non-global config"
@ -316,20 +257,20 @@
;; (enc/lazy-seq? x) (pr-str x) ; Dubious? ;; (enc/lazy-seq? x) (pr-str x) ; Dubious?
:else x)))) :else x))))
xs)) xs))
(defn- str-join [xs] (enc/spaced-str-with-nils xs))) (defn- str-join [xs] (str/join " " #+clj xs #+cljs (filter identity xs))))
(comment (comment
(defrecord MyRec [x]) (defrecord MyRec [x])
(str-join ["foo" (MyRec. "foo")])) (str-join ["foo" (MyRec. "foo")]))
#+clj #+clj
(enc/defonce* ^:private get-agent (enc/defonce ^:private get-agent
(enc/memoize_ (fn [appender-id] (agent nil :error-mode :continue)))) (enc/memoize_ (fn [appender-id] (agent nil :error-mode :continue))))
(comment (get-agent :my-appender)) (comment (get-agent :my-appender))
(enc/defonce* ^:private get-rate-limiter (defonce ^:private get-rate-limiter
(enc/memoize_ (fn [appender-id specs] (enc/rate-limiter* specs)))) (enc/memoize_ (fn [appender-id specs] (enc/limiter specs))))
(comment (def rf (get-rate-limiter :my-appender [[10 5000]]))) (comment (def rf (get-rate-limiter :my-appender [[10 5000]])))
@ -642,19 +583,17 @@
(infof (Exception.))) (infof (Exception.)))
(defmacro -log-errors [?line & body] (defmacro -log-errors [?line & body]
`(let [[?result# ?error#] (enc/catch-errors ~@body)] `(enc/catching (do ~@body) e#
(when-let [e# ?error#] (do
;; (error e#) ; CLJ-865 #_(error e#) ; CLJ-865
(log! :error :p [e#] ~{:?line ?line})) (log! :error :p [e#] ~{:?line ?line}))))
?result#))
(defmacro -log-and-rethrow-errors [?line & body] (defmacro -log-and-rethrow-errors [?line & body]
`(let [[?result# ?error#] (enc/catch-errors ~@body)] `(enc/catching (do ~@body) e#
(when-let [e# ?error#] (do
;; (error e#) ; CLJ-865 #_(error e#) ; CLJ-865
(log! :error :p [e#] ~{:?line ?line}) (log! :error :p [e#] ~{:?line ?line})
(throw e#)) (throw e#))))
?result#))
(defmacro -logged-future [?line & body] `(future (-log-errors ~?line ~@body))) (defmacro -logged-future [?line & body] `(future (-log-errors ~?line ~@body)))
@ -788,16 +727,17 @@
;;;; Deprecated ;;;; Deprecated
#+cljs (def console-?appender core-appenders/console-appender) (enc/deprecated
(def ordered-levels -levels-vec) #+cljs (def console-?appender core-appenders/console-appender)
(def log? may-log?) (def ordered-levels -levels-vec)
(defn logging-enabled? [level compile-time-ns] (may-log? level (str compile-time-ns))) (def log? may-log?)
(defn str-println [& xs] (str-join xs)) (defn logging-enabled? [level compile-time-ns] (may-log? level (str compile-time-ns)))
(defmacro with-log-level [level & body] `(with-level ~level ~@body)) (defn str-println [& xs] (str-join xs))
(defmacro with-logging-config [config & body] `(with-config ~config ~@body)) (defmacro with-log-level [level & body] `(with-level ~level ~@body))
(defmacro logp [& sigs] `(log ~@sigs)) (defmacro with-logging-config [config & body] `(with-config ~config ~@body))
(defmacro log-env (defmacro logp [& args] `(log ~@args))
(defmacro log-env
([ ] `(log-env :debug)) ([ ] `(log-env :debug))
([ level ] `(log-env ~level "&env")) ([ level ] `(log-env ~level "&env"))
([ level name] `(log-env *config* ~level ~name)) ([ level name] `(log-env *config* ~level ~name))
([config level name] `(log* ~config ~level ~name "=>" (get-env)))) ([config level name] `(log* ~config ~level ~name "=>" (get-env)))))

2
src/taoensso/timbre/appenders/postal.clj
View File

@ -35,7 +35,7 @@
:subject (-> output-str :subject (-> output-str
(str/trim) (str/trim)
(str/replace #"\s+" " ") (str/replace #"\s+" " ")
(enc/substr 0 subject-len)) (enc/get-substring 0 subject-len))
:body (body-fn output-str)))))}) :body (body-fn output-str)))))})
;;;; Deprecated ;;;; Deprecated

2
src/taoensso/timbre/profiling.clj
View File

@ -194,7 +194,7 @@
(let [nanosecs (long nanosecs) ; Truncate any fractional nanosecs (let [nanosecs (long nanosecs) ; Truncate any fractional nanosecs
pow #(Math/pow 10 %) pow #(Math/pow 10 %)
ok-pow? #(>= nanosecs (pow %)) ok-pow? #(>= nanosecs (pow %))
to-pow #(enc/round (/ nanosecs (pow %1)) :round %2)] to-pow #(enc/round* :round %2 (/ nanosecs (pow %1)))]
(cond (ok-pow? 9) (str (to-pow 9 1) "s") (cond (ok-pow? 9) (str (to-pow 9 1) "s")
(ok-pow? 6) (str (to-pow 6 0) "ms") (ok-pow? 6) (str (to-pow 6 0) "ms")
(ok-pow? 3) (str (to-pow 3 0) "μs") (ok-pow? 3) (str (to-pow 3 0) "μs")