From 6d9a88c33b9e9b8504fed97b67f19861bc12015f Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 19 Aug 2014 20:56:25 +1000
Subject: [PATCH] FIX: hanging specs
---
lib/sidekiq/pausable.rb | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/sidekiq/pausable.rb b/lib/sidekiq/pausable.rb
index 17246593022..3ef356c8312 100644
--- a/lib/sidekiq/pausable.rb
+++ b/lib/sidekiq/pausable.rb
@@ -21,11 +21,7 @@ class SidekiqPauser
def unpause!
@mutex.synchronize do
- if @extend_lease_thread
- @extend_lease_thread.kill
- @extend_lease_thread.join
- @extend_lease_thread = nil
- end
+ @extend_lease_thread = nil
end
redis.del(paused_key)
@@ -37,6 +33,7 @@ class SidekiqPauser
def extend_lease_thread
Thread.new do
while true do
+ break unless @mutex.synchronize { @extend_lease_thread }
redis.expire paused_key, 60
sleep 30
end