status-im/timbre
2
0
Fork 0
mirror of https://github.com/status-im/timbre.git synced 2025-02-27 02:20:39 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Mod Carmine appender to work correctly with Carmine v3+"

Browse Source 
This reverts commit 338ac0497dd2f66eb34b9d94e58981691f58fbd8.

On second thought, better addressed upstream by Carmine v3
This commit is contained in:
Peter Taoussanis 2014-03-09 18:00:20 +07:00
parent 28b4c55db4
commit 2b8a9d6c80
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -1,11 +1,8 @@
## v3.1.2 / 2014 Mar 9
* FIX: Carmine appender unfreezable support for Carmine v3+.
## v3.1.1 / 2014 Feb 26 ## v3.1.1 / 2014 Feb 26
* FIX: project.clj to prevent unnecessary downstream deps. ### Fixes
* Fix project.clj to prevent unnecessary downstream deps.
## v3.1.0 / 2014 Feb 23 ## v3.1.0 / 2014 Feb 23

7
src/taoensso/timbre/appenders/carmine.clj
View File

@ -59,10 +59,9 @@
nmax-entries (nentries-by-level level)] nmax-entries (nentries-by-level level)]
(when (> nmax-entries 0) (when (> nmax-entries 0)
(binding [nippy/*final-freeze-fallback* nippy/freeze-fallback-as-str]
(car/wcar (or conn-opts (:conn opts)) ; :conn is Deprecated (car/wcar (or conn-opts (:conn opts)) ; :conn is Deprecated
(binding [nippy/*final-freeze-fallback* nippy/freeze-fallback-as-str]
(car/hset k-hash entry-hash entry) (car/hset k-hash entry-hash entry))
(car/zadd k-zset udt entry-hash) (car/zadd k-zset udt entry-hash)
(when (< (rand) 0.01) ; Occasionally GC (when (< (rand) 0.01) ; Occasionally GC
@ -82,7 +81,7 @@
return nil" return nil"
{:k-zset k-zset {:k-zset k-zset
:k-hash k-hash} :k-hash k-hash}
{:nmax-entries nmax-entries})))))))}))) {:nmax-entries nmax-entries}))))))})))
;;;; Query utils ;;;; Query utils