Speed up shutdown, only pause 5 seconds if necessary

lib/sidekiq/cli.rb

@@ -57,7 +57,7 @@ module Sidekiq
         sleep
       rescue Interrupt
         # TODO Need clean shutdown support from Celluloid
-        logger.info 'Shutting down, pausing 5 seconds to let workers finish...'
+        logger.info 'Shutting down'
         manager.stop!
         manager.wait(:shutdown)
       end

lib/sidekiq/manager.rb

@@ -35,16 +35,23 @@ module Sidekiq
       @ready.each(&:terminate)
       @ready.clear
 
-      after(5) do
-        signal(:shutdown)
-      end
-
       redis.with_connection do |conn|
         workers = conn.smembers('workers')
         workers.each do |name|
           conn.srem('workers', name) if name =~ /:#{process_id}-/
         end
       end
+
+      if @busy.empty?
+        return signal(:shutdown)
+      end
+
+      logger.info("Pausing 5 seconds to allow workers to finish...")
+      after(5) do
+        @busy.each(&:terminate)
+        #@busy.each(&:requeue)
+        signal(:shutdown)
+      end
     end
 
     def start