discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 11:19:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: hanging specs

Browse Source
This commit is contained in:
Sam 2014-08-19 20:56:25 +10:00
parent 76e74f6a3b
commit 6d9a88c33b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/sidekiq/pausable.rb
View File

@ -21,12 +21,8 @@ class SidekiqPauser
def unpause! def unpause!
@mutex.synchronize do @mutex.synchronize do
if @extend_lease_thread
@extend_lease_thread.kill
@extend_lease_thread.join
@extend_lease_thread = nil @extend_lease_thread = nil
end end
end
redis.del(paused_key) redis.del(paused_key)
true true
@ -37,6 +33,7 @@ class SidekiqPauser
def extend_lease_thread def extend_lease_thread
Thread.new do Thread.new do
while true do while true do
break unless @mutex.synchronize { @extend_lease_thread }
redis.expire paused_key, 60 redis.expire paused_key, 60
sleep 30 sleep 30
end end