robust-redis-lock 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fa5c673571893a2695d8a6b4938a0244c1014ba
-  data.tar.gz: da55dd270b522b7a845cf54d999d854efda7352d
+  metadata.gz: 23f3a1cbf8593c30a609665262248cc8359727ba
+  data.tar.gz: 3aff7aaaca003505cf84213eef01421ab98eef32
 SHA512:
-  metadata.gz: 279699f922fe00b4b72428878a044edb0fcb9a411bbb141688ff2d53c6bc1596ce5da6127a41108474064bb2217bcd11081bd2ea12faff97f83ab1c549deb91f
-  data.tar.gz: 2d9e74e71ca98ebcd1f18a274f109b5d51b0bfd1ffebcf207bbb9c20264831041191dfb28d87e205110347ad06e243b43591b8d81f7f1de4ac1084b4fa0bff89
+  metadata.gz: ceb8ffe2f1b2885cae20a2c586e82fc1e1fd9e4ba2956cf50b024f62a51ade42f6649a419924fe8f12c2d48d2aa4c1447c1f096294754c70acbc6e35ad1ed3d3
+  data.tar.gz: 62a08c7e3bdd4ce2b765128f79d71ee2d70df13120a70cc554102492770ef647dcefe05807329458f17121d61c8853fc6aa12607fd4ff43bce774cc21501239c

data/lib/redis-lock.rb

@@ -19,7 +19,20 @@ class Redis::Lock
       redis = options[:redis] || self.redis
       raise "redis cannot be nil" if redis.nil?
 
-      redis.zrangebyscore(key_group_key(options), 0, Time.now.to_i).to_a.map { |key| self.new(key, options) }
+      redis.zrangebyscore(key_group_key(options), 0, Time.now.to_i).to_a.map do |key_token|
+        key, token = key_token.scan(/(.*):(.*)$/).first
+        self.new(key, options.merge(:token => token))
+      end
+    end
+
+    def all(options={})
+      redis = options[:redis] || self.redis
+      raise "redis cannot be nil" if redis.nil?
+
+      redis.zrangebyscore(key_group_key(options), 0, "+inf").to_a.map do |key_token|
+        key, token = key_token.scan(/(.*):(.*)$/).first
+        self.new(key, options.merge(:token => token))
+      end
     end
 
     def key_group_key(options)
@@ -44,6 +57,7 @@ class Redis::Lock
     @timeout    = @options[:timeout]    || self.class.timeout
     @expire     = @options[:expire]     || self.class.expire
     @sleep      = @options[:sleep]      || self.class.sleep
+    @token      = @options[:token]
   end
 
   def synchronize(&block)
@@ -54,6 +68,7 @@ class Redis::Lock
       try_unlock
     end
   rescue Recovered
+    block.call
   end
 
   def lock(options={})
@@ -91,18 +106,22 @@ class Redis::Lock
         local next_token = redis.call('incr', token_key)
 
         redis.call('hset', key, 'expires_at', expires_at)
-        redis.call('hset', key, 'token', next_token)
-        redis.call('zadd', key_group, expires_at, bare_key)
+        redis.call('zadd', key_group, expires_at, bare_key .. ':' .. next_token)
 
+        local return_value = nil
         if prev_expires_at then
-          return {'recovered', next_token, redis.call('hget', key, 'recovery_data')}
+          redis.call('zrem', key_group, bare_key .. ':' .. redis.call('hget', key, 'token'))
+          return_value =  {'recovered', next_token, redis.call('hget', key, 'recovery_data')}
         else
           redis.call('hset', key, 'recovery_data', recovery_data)
-          return {'acquired', next_token, nil}
+          return_value =  {'acquired', next_token, nil}
         end
+
+        redis.call('hset', key, 'token', next_token)
+        return return_value
     LUA
     result, token, recovery_data = @@lock_script.eval(@redis,
-                                                      :keys => [NAMESPACE + @key, @key_group_key],
+                                                      :keys => [namespaced_key, @key_group_key],
                                                       :argv => [@key, now.to_i, now.to_i + @expire, options[:recovery_data]])
 
     case result
@@ -134,13 +153,13 @@ class Redis::Lock
 
         if redis.call('hget', key, 'token') == token then
           redis.call('del', key)
-          redis.call('zrem', key_group, bare_key)
+          redis.call('zrem', key_group, bare_key .. ':' .. token)
           return true
         else
           return false
         end
     LUA
-    !!@@unlock_script.eval(@redis, :keys => [NAMESPACE + @key, @key_group_key], :argv => [@key, @token])
+    !!@@unlock_script.eval(@redis, :keys => [namespaced_key, @key_group_key], :argv => [@key, @token])
   end
 
   def extend
@@ -154,16 +173,30 @@ class Redis::Lock
         local bare_key = ARGV[1]
         local expires_at = tonumber(ARGV[2])
         local token = ARGV[3]
+        local token_key = 'redis:lock:token'
 
         if redis.call('hget', key, 'token') == token then
+          local next_token = redis.call('incr', token_key)
+
           redis.call('hset', key, 'expires_at', expires_at)
-          redis.call('zadd', key_group, expires_at, bare_key)
-          return true
+          redis.call('hset', key, 'token', next_token)
+
+          redis.call('zrem', key_group, bare_key .. ':' .. token)
+          redis.call('zadd', key_group, expires_at, bare_key .. ':' .. next_token)
+
+          return { next_token, redis.call('hget', key, 'recovery_data') }
         else
           return false
         end
     LUA
-    !!@@extend_script.eval(@redis, :keys => [NAMESPACE + @key, @key_group_key], :argv => [@key, now.to_i + @expire, @token])
+    result = @@extend_script.eval(@redis, :keys => [namespaced_key, @key_group_key], :argv => [@key, now.to_i + @expire, @token])
+
+    if result
+      @token, @recovery_data = result
+      true
+    else
+      false
+    end
   end
 
   def now
@@ -178,7 +211,11 @@ class Redis::Lock
     @key
   end
 
-  class ErrorBase < RuntimeError
+  def namespaced_key
+    NAMESPACE + ':' + @key
+  end
+
+  class Error < RuntimeError
     attr_reader :lock
 
     def initialize(lock)
@@ -186,19 +223,19 @@ class Redis::Lock
     end
   end
 
-  class LostLock < ErrorBase
+  class LostLock < Error
     def message
       "The following lock was lost while trying to modify: #{@lock}"
     end
   end
 
-  class Redis::Lock::Recovered < ErrorBase
+  class Recovered < Error
     def message
       "The following lock was recovered: #{@lock}"
     end
   end
 
-  class Redis::Lock::Timeout < ErrorBase
+  class Timeout < Error
     def message
       "The following lock timed-out waiting to get aquired: #{@lock}"
     end

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

@@ -1,5 +1,5 @@
 class Redis
   class Lock
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust-redis-lock
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kareem Kouddous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Robust redis lock