Allow TERM to follow a USR1 by not blocking the main thread.

sidekiq · Dec 10, 2013 · 0429104 · 0429104
1 parent de65b2e
commit 0429104
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
@@ -17,6 +17,8 @@ module Sidekiq
   # DO NOT RESCUE THIS ERROR.
   class Shutdown < Interrupt; end
 
+  class USR1Interrupt < Interrupt; end
+
   class CLI
     include Util
     include Singleton
@@ -76,22 +78,14 @@ def run
         end
       rescue USR1Interrupt
         logger.info 'Stopping work, will shut down when workers finish'
-        stop(false)
+        launcher.async.stop(false)
       rescue Interrupt
         logger.info 'Shutting down'
-        stop
+        launcher.async.stop
       end
     end
 
     private
-
-    def stop(force_shutdown_after_timeout = true)
-      launcher.stop(force_shutdown_after_timeout)
-      # Explicitly exit so busy Processor threads can't block
-      # process shutdown.
-      exit(0)
-    end
-
     def handle_signal(sig)
       Sidekiq.logger.debug "Got #{sig} signal"
       case sig

diff --git a/lib/sidekiq/launcher.rb b/lib/sidekiq/launcher.rb
@@ -50,6 +50,8 @@ def stop(force_shutdown_after_timeout = true)
         manager.async.stop(opts)
         manager.wait(:shutdown)
       end
+
+      exit(0)
     end
 
     def procline(tag)

diff --git a/lib/sidekiq/usr1_interrupt.rb b/lib/sidekiq/usr1_interrupt.rb