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

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

This reverts commit 338ac0497d.

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
* FIX: project.clj to prevent unnecessary downstream deps.
### Fixes
* Fix project.clj to prevent unnecessary downstream deps.
## v3.1.0 / 2014 Feb 23

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

@ -59,30 +59,29 @@
nmax-entries (nentries-by-level level)]
(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/zadd k-zset udt entry-hash)
(car/hset k-hash entry-hash entry)
(car/zadd k-zset udt entry-hash)
(when (< (rand) 0.01) ; Occasionally GC
;; This is necessary since we're doing zset->entry-hash->entry
;; rather than zset->entry. We want the former for the control
;; it gives us over what should constitute a 'unique' entry.
(car/lua
"-- -ive idx used to prune from the right (lowest score first)
local max_idx = (0 - (tonumber(_:nmax-entries)) - 1)
local entries_to_prune =
redis.call('zrange', _:k-zset, 0, max_idx)
redis.call('zremrangebyrank', _:k-zset, 0, max_idx) -- Prune zset
(when (< (rand) 0.01) ; Occasionally GC
;; This is necessary since we're doing zset->entry-hash->entry
;; rather than zset->entry. We want the former for the control
;; it gives us over what should constitute a 'unique' entry.
(car/lua
"-- -ive idx used to prune from the right (lowest score first)
local max_idx = (0 - (tonumber(_:nmax-entries)) - 1)
local entries_to_prune =
redis.call('zrange', _:k-zset, 0, max_idx)
redis.call('zremrangebyrank', _:k-zset, 0, max_idx) -- Prune zset
for i,entry in pairs(entries_to_prune) do
redis.call('hdel', _:k-hash, entry) -- Prune hash
end
return nil"
{:k-zset k-zset
:k-hash k-hash}
{:nmax-entries nmax-entries})))))))})))
for i,entry in pairs(entries_to_prune) do
redis.call('hdel', _:k-hash, entry) -- Prune hash
end
return nil"
{:k-zset k-zset
:k-hash k-hash}
{:nmax-entries nmax-entries}))))))})))
;;;; Query utils