Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,16 @@
 > This project uses [Break Versioning](https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md) as of **Aug 16, 2014**.
 
+## v4.1.1 / 2015 Aug 16
+
+> This is a non-breaking hotfix release
+
+* **Fix**: shutdown-agents shutdown hook can interfere with other important hooks [#127 @hadronzoo]
+
+```clojure
+[com.taoensso/timbre "4.1.1"]
+```
+
+
 ## v4.1.0 / 2015 Aug 7
 
 > This is a non-breaking feature release

README.md

@@ -1,7 +1,7 @@
 **[API docs][]** | **[CHANGELOG][]** | [other Clojure libs][] | [Twitter][] | [contact/contrib](#contact--contributing) | current [Break Version][]:
 
 ```clojure
-[com.taoensso/timbre "4.1.0"] ; Stable, see CHANGELOG for details
+[com.taoensso/timbre "4.1.1"] ; Stable, see CHANGELOG for details
 [com.taoensso/timbre "3.4.0"] ; Legacy
 ```
 
@@ -36,7 +36,7 @@ Timbre offers an **all Clojure/Script** alternative that **works out the box**.
 Add the necessary dependency to your [Leiningen][] `project.clj` and `require` the necessary namespaces:
 
 ```clojure
-[com.taoensso/timbre "4.1.0"] ; Add to your project.clj :dependencies
+[com.taoensso/timbre "4.1.1"] ; Add to your project.clj :dependencies
 
 (ns my-clj-ns ; Clj ns => use `:refer`
   (:require

project.clj

@@ -1,4 +1,4 @@
-(defproject com.taoensso/timbre "4.1.0"
+(defproject com.taoensso/timbre "4.1.1"
   :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Clojure/Script logging & profiling library"
   :url "https://github.com/ptaoussanis/timbre"

src/taoensso/timbre.cljx

@@ -582,14 +582,6 @@
    `(do (assert (<= 0 ~probability 1) "Probability: 0 <= p <= 1")
         (when (< (rand) ~probability) ~@body)))
 
-;;;; EXPERIMENTAL shutdown hook
-;; Workaround for http://dev.clojure.org/jira/browse/CLJ-124
-
-#+clj
-(defonce ^:private shutdown-hook
-  (.addShutdownHook (Runtime/getRuntime)
-    (Thread. (fn [] (shutdown-agents)))))
-
 ;;;; Deprecated
 
 (defn str-println [& xs] (enc/spaced-str xs))