nogara-redis_failover 0.9.7.2 → 0.9.7.3

data/lib/redis_failover/node_watcher.rb

@@ -18,8 +18,6 @@ module RedisFailover
       @node = node
       @max_failures = max_failures
       @monitor_thread = nil
-      @shutdown_lock = Mutex.new
-      @shutdown_cv = ConditionVariable.new
       @done = false
     end
 
@@ -34,15 +32,13 @@ module RedisFailover
 
     # Performs a graceful shutdown of this watcher.
     def shutdown
-      @shutdown_lock.synchronize do
-        @done = true
-        begin
-          @node.wakeup
-        rescue
-          # best effort
-        end
-        @shutdown_cv.wait(@shutdown_lock)
+      @done = true
+      begin
+        @node.wakeup
+      rescue
+        # best effort
       end
+      @monitor_thread.join
     rescue => ex
       logger.warn("Failed to gracefully shutdown watcher for #{@node}")
     end
@@ -74,10 +70,6 @@ module RedisFailover
           logger.error(ex.backtrace.join("\n"))
         end
       end
-
-      @shutdown_lock.synchronize do
-        @shutdown_cv.broadcast
-      end
     end
 
     # Notifies the manager of a node's state.

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '0.9.7.2'
+  VERSION = '0.9.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nogara-redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.9.7.2
+  version: 0.9.7.3
   prerelease: 
 platform: ruby
 authors: