Execute shutdown event async from rest of system shutdown, fixes side…

…kiq#2635
jaanek · Oct 31, 2015 · 2022b6b · 2022b6b
1 parent b0d6069
commit 2022b6b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,10 @@
 # Sidekiq Changes
 
+3.5.3
+-----------
+
+- Adjust shutdown event to run in parallel with the rest of system shutdown. [#2635]
+
 3.5.2
 -----------
 

diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
@@ -94,7 +94,6 @@ def run
       rescue Interrupt
         logger.info 'Shutting down'
         launcher.stop
-        fire_event(:shutdown, true)
         # Explicitly exit so busy Processor threads can't block
         # process shutdown.
         exit(0)

diff --git a/lib/sidekiq/launcher.rb b/lib/sidekiq/launcher.rb
@@ -52,6 +52,7 @@ def stop
         poller.terminate if poller.alive?
 
         manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
+        fire_event(:shutdown, true)
         @condvar.wait
         manager.terminate
 

diff --git a/lib/sidekiq/version.rb b/lib/sidekiq/version.rb
@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.5.2"
+  VERSION = "3.5.3"
 end