robust-redis-lock 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d01644e1b5f69294708e5de33618bc62c2eff7b7
-  data.tar.gz: 41772d6656bff57ce9a552ea834181dfbc6d0289
+  metadata.gz: ff73b4f537214a712e375526275c68be1037ea7e
+  data.tar.gz: 50257826714c16e8cba1658f89fac74e65a9452f
 SHA512:
-  metadata.gz: a643e22cb0d7f53b8eda94bbbe799bfb44109926655675ce8acc93237442be9d6fbd4017ca3d0de406b95d3c9e9ced32658e58d95ec7f6aa81121ffe716b18cc
-  data.tar.gz: 92caa5262446e635736f6326fe389975ff0ee71193c303f56b78881d867d354fc93db2babb8ac5b304bb22426a89508a4b5a24bf7469f2d80e204e8b6d62776e
+  metadata.gz: dd8d1e3474a94440fe7cde4a04c005337acdba1fa1c0b700a39e00fb03e559b76a4e941f32dca30ed6618513d47f3f9ffc8e28c4efe7ee04b7b11a01e2fb2c1d
+  data.tar.gz: 72dd7a3174784487cca91c6bfa8dbd52621edbafc8c696ab88421c13bdeba670a5b23a8d875441574a952c747b85d616d6a553e38b750a44c1db97bb08a1fe6e

data/lib/redis-lock.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'yaml'
 
 class Redis::Lock
   require 'robust-redis-lock/script'
@@ -12,6 +13,7 @@ class Redis::Lock
     attr_accessor :expire
     attr_accessor :namespace
     attr_accessor :key_group
+    attr_accessor :serializer
 
     def expired(options={})
       self.redis.zrangebyscore(key_group_key(options), 0, Time.now.to_i).map { |key| self.new(key, options) }
@@ -26,26 +28,36 @@ class Redis::Lock
     end
   end
 
-  self.timeout   = 60
-  self.expire    = 60
-  self.sleep     = 0.1
-  self.namespace = 'redis:lock'
-  self.key_group = 'default'
+  self.timeout    = 60
+  self.expire     = 60
+  self.sleep      = 0.1
+  self.namespace  = 'redis:lock'
+  self.key_group  = 'default'
+  self.serializer = YAML
 
-  def initialize(key, options={})
+  def initialize(*args)
+    raise "invalid number of args: expected 1..3, got #{args.length}" if args.length < 1 || args.length > 3
+
+    key = args.shift
     raise "key cannot be nil" if key.nil?
-    @options   = options
 
-    namespace_prefix = self.class.namespace_prefix(options) unless key.start_with?(self.class.namespace_prefix(options))
+    if args.length == 2
+      @data = args.shift
+    end
+
+    @options = args.shift || {}
+
+    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
+    @redis    = @options[:redis] || self.class.redis
     raise "redis cannot be nil" if @redis.nil?
 
-    @timeout  = options[:timeout] || self.class.timeout
-    @expire   = options[:expire]  || self.class.expire
-    @sleep    = options[:sleep]   || self.class.sleep
+    @timeout    = @options[:timeout]    || self.class.timeout
+    @expire     = @options[:expire]     || self.class.expire
+    @sleep      = @options[:sleep]      || self.class.sleep
+    @serializer = @options[:serializer] || self.class.serializer
   end
 
   def lock
@@ -63,6 +75,10 @@ class Redis::Lock
     unlock if block_given?
   end
 
+  def data
+    @data ||= @serializer.load(@redis.hget(key, 'data'))
+  end
+
   def try_lock
     # This script loading is not thread safe (touching a class variable), but
     # that's okay, because the race is harmless.
@@ -71,6 +87,7 @@ class Redis::Lock
         local key_group = KEYS[2]
         local now = tonumber(ARGV[1])
         local expires_at = tonumber(ARGV[2])
+        local data = ARGV[3]
         local token_key = 'redis:lock:token'
 
         local prev_expires_at = tonumber(redis.call('hget', key, 'expires_at'))
@@ -82,6 +99,7 @@ class Redis::Lock
 
         redis.call('hset', key, 'expires_at', expires_at)
         redis.call('hset', key, 'token', next_token)
+        redis.call('hset', key, 'data', data)
         redis.call('zadd', key_group, expires_at, key)
 
         if prev_expires_at then
@@ -90,7 +108,7 @@ class Redis::Lock
           return {'acquired', next_token}
         end
     LUA
-    result, token = @@lock_script.eval(@redis, :keys => [@key, @key_group_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, @serializer.dump(@data)])
 
     @token = token if token
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robust-redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kareem Kouddous