kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Merge pull request #1423 from mperham/feature/fetcher-join

Browse source 
Terminate the poller and the fetcher synchronously.
This commit is contained in:
Mike Perham 2014-01-12 13:50:51 -08:00
commit c89cca6aff
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/sidekiq/launcher.rb
View file

@ -43,8 +43,8 @@ module Sidekiq
watchdog('Launcher#stop') do watchdog('Launcher#stop') do
@done = true @done = true
Sidekiq::Fetcher.done! Sidekiq::Fetcher.done!
fetcher.async.terminate if fetcher.alive? fetcher.terminate if fetcher.alive?
poller.async.terminate if poller.alive? poller.terminate if poller.alive?
manager.async.stop(:shutdown => true, :timeout => @options[:timeout]) manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
manager.wait(:shutdown) manager.wait(:shutdown)