redis_failover 0.9.7 → 0.9.7.1

data/Changes.md

@@ -1,3 +1,7 @@
+0.9.7.1
+-----------
+- Stop repeated attempts to acquire exclusive lock in Node Manager (#36)
+
 0.9.7
 -----------
 - Stubbed Client#client to return itself, fixes a fork reconnect bug with Resque (dbalatero)

data/lib/redis_failover/node_manager.rb

@@ -95,6 +95,9 @@ module RedisFailover
       logger.info('Shutting down ...')
       @mutex.synchronize do
         @shutdown = true
+        unless @leader
+          reset
+        end
       end
     end
 
@@ -406,8 +409,12 @@ module RedisFailover
     # Executes a block wrapped in a ZK exclusive lock.
     def with_lock
       @zk_lock = @zk.locker(@lock_path)
-      while running? && !@zk_lock.lock
-        sleep(TIMEOUT)
+
+      begin
+        @zk_lock.lock!(true)
+      rescue Exception
+        # handle shutdown case
+        running? ? raise : return
       end
 
       if running?

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '0.9.7'
+  VERSION = '0.9.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2274017525429057162
+      hash: 4040102937277338807
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2274017525429057162
+      hash: 4040102937277338807
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23