redis-lock 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1a7d5931088efd38747ab5b9c34d9ad2fd67fcdc
+  data.tar.gz: eccb2bdfa1a0b705b4927ba88857a3965e479307
+SHA512:
+  metadata.gz: a48d69c32bd5eb05d13bbb6b12239c26dbf81d679760e811e770078450232e22a9385e699f61ddb850554a085aaade1eca2fb9a52875af4c44e9f43f5f1e569b
+  data.tar.gz: c1b857647f101f6be722eeebaf474dc9cf7d984f49760e7b9edd4afc819475ec8d185602aaba128aac6c1b1b1f11bc99e4c3633096b165be611a318d8698ac5d

data/lib/redis-lock.rb

@@ -4,4 +4,4 @@ class Redis
   include Redis::Lock
 end
 
-class RedisLockException < Exception; end
+class RedisLockException < StandardError; end

data/lib/redis-lock/version.rb

@@ -1,5 +1,5 @@
-module Redis
+class Redis
   module Lock
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/lib/redis/lock.rb

@@ -34,7 +34,7 @@ class Redis
       current_lock_key = lock_key(key)
       expiration_value = lock_expiration(timeout)
       attempt_counter = 0
-      begin
+      while attempt_counter < max_attempts
         if self.setnx(current_lock_key, expiration_value)
           return true
         else
@@ -44,24 +44,15 @@ class Redis
             return true if compare_value == current_lock
           end
         end
-      
-        raise RedisLockException.new("Unable to acquire lock for #{key}.")
-      rescue Exception => e
-        if e.message == "Unable to acquire lock for #{key}."
-          attempt_counter += 1
-          if attempt_counter == max_attempts
-            raise
-          else
-            sleep 1
-            retry
-          end
-        else
-          raise
-        end
+
+        attempt_counter += 1
+        sleep 1 if attempt_counter < max_attempts
       end
+
+      raise RedisLockException.new("Unable to acquire lock for #{key}.")
     end
     
-    # Unlock a previously locked key if it has not expired and the current process was the one that locked it.
+    # Unlock a previously locked key if it has not expired and the current process/thread was the one that locked it.
     # 
     # Example:
     # 
@@ -71,8 +62,8 @@ class Redis
       current_lock_key = lock_key(key)
       lock_value = self.get(current_lock_key)
       return true unless lock_value
-      lock_timeout, lock_holder = lock_value.split('-')
-      if (lock_timeout.to_i > Time.now.to_i) && (lock_holder.to_i == Process.pid)
+      lock_timeout, lock_process, lock_thread = lock_value.split('-')
+      if (lock_timeout.to_i > Time.now.to_i) && (lock_process.to_i == Process.pid) && lock_thread.to_i == Thread.current.object_id
         self.del(current_lock_key)
         return true
       else
@@ -83,7 +74,7 @@ class Redis
     private
   
     def lock_expiration(timeout)
-      "#{Time.now.to_i + timeout + 1}-#{Process.pid}"
+      "#{Time.now.to_i + timeout + 1}-#{Process.pid}-#{Thread.current.object_id}"
     end
   
     def lock_key(key)

data/redis-lock.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Pessimistic locking for ruby redis}
   gem.summary       = %q{Pessimistic locking for ruby redis}
   gem.homepage      = "https://github.com/PatrickTulskie/redis-lock"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/redis_spec.rb

@@ -44,26 +44,26 @@ describe 'redis' do
   end
   
   it "should raise an exception if unable to acquire lock" do
-    @redis.lock('test_key', 9000)
-    lambda { @redis.lock('test_key', 9000, 1) }.should raise_exception("Unable to acquire lock for test_key.")
+    @redis.lock('test_key', 1000)
+    lambda { @redis.lock('test_key', 1000, 1) }.should raise_exception("Unable to acquire lock for test_key.")
   end
   
   it "should execute a block during a lock_for_update transaction" do
-    @redis.lock_for_update('test_key', 9000) { @redis.set('test_key', 'awesome') }
+    @redis.lock_for_update('test_key', 1000) { @redis.set('test_key', 'awesome') }
     @redis.get('test_key').should == 'awesome'
   end
   
   it "should unlock at the end of a lock_for_update" do
-    @redis.lock_for_update('test_key', 9000) { @redis.set('test_key', 'awesome') }
+    @redis.lock_for_update('test_key', 1000) { @redis.set('test_key', 'awesome') }
     @redis.get('lock:test_key').should be_nil
   end
 
   it "should keep trying to lock a key" do
     time = DateTime.now
-    @redis.lock('test_key', 9000)
-    lambda { @redis.lock('test_key', 9000, 10) }.should raise_exception("Unable to acquire lock for test_key.")
-    # Should have spent 9 seconds trying to lock
-    DateTime.now.should >= time + Rational(9, 86400)
+    @redis.lock('test_key', 1000)
+    lambda { @redis.lock('test_key', 1000, 2) }.should raise_exception("Unable to acquire lock for test_key.")
+    # Should have spent 1 second trying to lock
+    DateTime.now.should >= time + Rational(1, 86400)
   end
   
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Patrick Tulskie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Pessimistic locking for ruby redis
@@ -50,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -63,28 +58,28 @@ files:
 - spec/redis_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/PatrickTulskie/redis-lock
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pessimistic locking for ruby redis
 test_files:
 - spec/redis_spec.rb