diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj index cad3881..dd0c4f0 100644 --- a/src/taoensso/nippy.clj +++ b/src/taoensso/nippy.clj @@ -265,10 +265,11 @@ ;;;; Dynamic config ;; See also `nippy.tools` ns for further dynamic config support -;; TODO Switch to thread-local proxies? +;; For back compatibility (nb Timbre's Carmine appender) +(enc/defonce ^:dynamic *final-freeze-fallback* "DEPRECATED: prefer `*freeze-fallback`." nil) +(enc/defonce ^:dynamic *freeze-fallback* "(fn [data-output x])->freeze, nil => default" nil) -(enc/defonce ^:dynamic *freeze-fallback* "(fn [data-output x]), nil => default" nil) -(enc/defonce ^:dynamic *custom-readers* "{ (fn [data-input])}" nil) +(enc/defonce ^:dynamic *custom-readers* "{ (fn [data-input])->read}" nil) (enc/defonce ^:dynamic *auto-freeze-compressor* "(fn [byte-array])->compressor used by `(freeze {:compressor :auto}), nil => default" @@ -278,8 +279,6 @@ (defn set-auto-freeze-compressor! [x] (alter-var-root #'*auto-freeze-compressor* (constantly x))) (defn swap-custom-readers! [f] (alter-var-root #'*custom-readers* f)) -(declare ^:dynamic *final-freeze-fallback*) ; DEPRECATED - ;;;; Freezing #_(do @@ -959,10 +958,7 @@ (try-write-serializable out x) (try-write-readable out x) - ;; For back compatibility (nb Timbre's Carmine appender) - (when-let [fff *final-freeze-fallback*] - (fff out x) - true) + (when-let [fff *final-freeze-fallback*] (fff out x) true) ; Deprecated (throw-unfreezable x)))) @@ -1713,6 +1709,4 @@ ;;;; Deprecated -(enc/deprecated - (enc/defonce ^:dynamic *final-freeze-fallback* "DEPRECATED" nil) - (def freeze-fallback-as-str "DEPRECATED" write-unfreezable)) +(enc/deprecated (def freeze-fallback-as-str "DEPRECATED" write-unfreezable)) diff --git a/src/taoensso/nippy/tools.clj b/src/taoensso/nippy/tools.clj index 18e98eb..2315f17 100644 --- a/src/taoensso/nippy/tools.clj +++ b/src/taoensso/nippy/tools.clj @@ -3,8 +3,6 @@ Used by Carmine, Faraday, etc." (:require [taoensso.nippy :as nippy])) -;; TODO Switch to thread-local proxies? - (def ^:dynamic *freeze-opts* nil) (def ^:dynamic *thaw-opts* nil)