Remove async on termination of fetcher/poller, leave everything else …

…the same.
sidekiq · Jan 10, 2014 · e0c20d1 · e0c20d1
1 parent 8d1eb10
commit e0c20d1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/sidekiq/launcher.rb b/lib/sidekiq/launcher.rb
@@ -43,12 +43,12 @@ def stop
       watchdog('Launcher#stop') do
         @done = true
         Sidekiq::Fetcher.done!
-        manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
-
         fetcher.terminate if fetcher.alive?
         poller.terminate if poller.alive?
 
+        manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
         manager.wait(:shutdown)
+
         # Requeue everything in case there was a worker who grabbed work while stopped
         Sidekiq::Fetcher.strategy.bulk_requeue([], @options)
       end