robust-redis-lock 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d9c9882c711325cf6560eaef7a0ea124a70575
-  data.tar.gz: d7f4c26f869c92382b7e2e0924749404e13c4c9a
+  metadata.gz: d01644e1b5f69294708e5de33618bc62c2eff7b7
+  data.tar.gz: 41772d6656bff57ce9a552ea834181dfbc6d0289
 SHA512:
-  metadata.gz: 3f6cb3c1b59df99f4c1531db778957d4279a186ce0c2d13c8515f70066528d7fdcb06060d08f63da3cce8dd1bb7093200f92dc9c69b0ac70367a3ebedf2a0d71
-  data.tar.gz: 22d94c6e9901cf5f6190306b2839e489d6015a1a33423d0030bca914ecbe567d78ec084d4f95acf6b94953a9e21ad950553e22fd648f9ae390e3534494eefc36
+  metadata.gz: a643e22cb0d7f53b8eda94bbbe799bfb44109926655675ce8acc93237442be9d6fbd4017ca3d0de406b95d3c9e9ced32658e58d95ec7f6aa81121ffe716b18cc
+  data.tar.gz: 92caa5262446e635736f6326fe389975ff0ee71193c303f56b78881d867d354fc93db2babb8ac5b304bb22426a89508a4b5a24bf7469f2d80e204e8b6d62776e

data/lib/redis-lock.rb

@@ -11,16 +11,34 @@ class Redis::Lock
     attr_accessor :sleep
     attr_accessor :expire
     attr_accessor :namespace
+    attr_accessor :key_group
+
+    def expired(options={})
+      self.redis.zrangebyscore(key_group_key(options), 0, Time.now.to_i).map { |key| self.new(key, options) }
+    end
+
+    def key_group_key(options)
+      [namespace_prefix(options), (options[:key_group] || self.key_group), 'group'].join(':')
+    end
+
+    def namespace_prefix(options)
+      (options[:namespace] || self.namespace)
+    end
   end
 
   self.timeout   = 60
   self.expire    = 60
   self.sleep     = 0.1
   self.namespace = 'redis:lock'
+  self.key_group = 'default'
 
   def initialize(key, options={})
     raise "key cannot be nil" if key.nil?
-    @key      = (options[:namespace] || self.class.namespace) + ":" + key
+    @options   = options
+
+    namespace_prefix = self.class.namespace_prefix(options) unless key.start_with?(self.class.namespace_prefix(options))
+    @key = [namespace_prefix, key].compact.join(':')
+    @key_group_key = self.class.key_group_key(@options)
 
     @redis    = options[:redis] || self.class.redis
     raise "redis cannot be nil" if @redis.nil?
@@ -50,6 +68,7 @@ class Redis::Lock
     # that's okay, because the race is harmless.
     @@lock_script ||= Script.new <<-LUA
         local key = KEYS[1]
+        local key_group = KEYS[2]
         local now = tonumber(ARGV[1])
         local expires_at = tonumber(ARGV[2])
         local token_key = 'redis:lock:token'
@@ -63,6 +82,7 @@ class Redis::Lock
 
         redis.call('hset', key, 'expires_at', expires_at)
         redis.call('hset', key, 'token', next_token)
+        redis.call('zadd', key_group, expires_at, key)
 
         if prev_expires_at then
           return {'recovered', next_token}
@@ -70,7 +90,7 @@ class Redis::Lock
           return {'acquired', next_token}
         end
     LUA
-    result, token = @@lock_script.eval(@redis, :keys => [@key], :argv => [now.to_i, now.to_i + @expire])
+    result, token = @@lock_script.eval(@redis, :keys => [@key, @key_group_key], :argv => [now.to_i, now.to_i + @expire])
 
     @token = token if token
 
@@ -87,36 +107,44 @@ class Redis::Lock
     # remains the same, and do not release when the lock timestamp was overwritten.
     @@unlock_script ||= Script.new <<-LUA
         local key = KEYS[1]
+        local key_group = KEYS[2]
         local token = ARGV[1]
 
         if redis.call('hget', key, 'token') == token then
           redis.call('del', key)
+          redis.call('zrem', key_group, key)
           return true
         else
           return false
         end
     LUA
-    result = @@unlock_script.eval(@redis, :keys => [@key], :argv => [@token])
+    result = @@unlock_script.eval(@redis, :keys => [@key, @key_group_key], :argv => [@token])
     !!result
   end
 
   def extend
     @@extend_script ||= Script.new <<-LUA
         local key = KEYS[1]
+        local key_group = KEYS[2]
         local expires_at = tonumber(ARGV[1])
         local token = ARGV[2]
 
         if redis.call('hget', key, 'token') == token then
           redis.call('hset', key, 'expires_at', expires_at)
+          redis.call('zadd', key_group, expires_at, key)
           return true
         else
           return false
         end
     LUA
-    !!@@extend_script.eval(@redis, :keys => [@key], :argv => [now.to_i + @expire, @token])
+    !!@@extend_script.eval(@redis, :keys => [@key, @key_group_key], :argv => [now.to_i + @expire, @token])
   end
 
   def now
     Time.now
   end
+
+  def ==(other)
+    self.key == other.key
+  end
 end

data/lib/robust-redis-lock/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Lock
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust-redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Kareem Kouddous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis