sidekiq-pool 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4da8dc5a63c3064f8f47611eda064ec761d1a2a
-  data.tar.gz: 404bc17015af307993c2ae053d2c31c384730a6a
+  metadata.gz: 1d4b9169e939905c1a912072469f50813745e13b
+  data.tar.gz: 1052a3df342858d35875a317147c990776c80a08
 SHA512:
-  metadata.gz: 9e79c107dc03d30521a5a1f9ebe6a0a681bac20d0e03917690c866771d5ef6dc3a63300d94a3734c156471339e5a7eb30611a22be3e1220325451b5ddaba6b6a
-  data.tar.gz: 74ad243c626ed4e11cc006dd29e2a5bedf77a2ef50ad8c726d2434ecb0ae6f168a5347db3cbbb154afcf968e3a728067382be1c1ce456ad71ea802dc3ce78e81
+  metadata.gz: ab482f6e449c0f7e58f8c1cb03ebc990a47115e75c13ab7f327f00c350fe86216e0b18e5798610d91b6e713c2d10698feacd5ffae658e873f580cd71dc8ba426
+  data.tar.gz: a18b21ceb6afd7642139eeb41f573f763d76ae3104ee28fc5c4c82ced774541fa559a3e3338e5ccb766d782ccede62dd663a35ce1090b218de5f72b1ba43b83d

data/lib/sidekiq/pool/cli.rb

@@ -200,9 +200,15 @@ module Sidekiq
 
       def stop_children
         logger.info 'Stopping children'
-
+        time = Time.now
         loop do
-          signal_to_pool('TERM')
+          wait_time = (Time.now - time).to_i
+          if wait_time > options[:timeout] + 2
+            logger.warn("Children didn't stop in #{wait_time}s, killing")
+            signal_to_pool('KILL')
+          else
+            signal_to_pool('TERM')
+          end
           sleep(1)
           ::Process.waitpid2(-1, ::Process::WNOHANG)
           break if @pool.none? { |pid| alive?(pid) }

data/lib/sidekiq/pool/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Pool
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pool
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Laurynas Butkus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq