sidekiq-pool 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b18df834e83b27a7507863976c2af09c93fea20d
-  data.tar.gz: 197cf40e14dda748bf363f33324fc753878de775
+  metadata.gz: b4da8dc5a63c3064f8f47611eda064ec761d1a2a
+  data.tar.gz: 404bc17015af307993c2ae053d2c31c384730a6a
 SHA512:
-  metadata.gz: 7fa18f3e36552979d1d0ae685323ef145fb3cdf5e8ce2eb3f8ba9825c8001829bf46b57481d9daffba77cbcb65262da67818416ed68352fde1e2436fe272b5bf
-  data.tar.gz: c4ccef02df6cfa61e0ef0263769e987953107b3949faaad1d8a0ee22351fdca799b0cb439b41c1517b63580f8586d6bc3fb17bfb1b496e63db73b3db2ec9c89a
+  metadata.gz: 9e79c107dc03d30521a5a1f9ebe6a0a681bac20d0e03917690c866771d5ef6dc3a63300d94a3734c156471339e5a7eb30611a22be3e1220325451b5ddaba6b6a
+  data.tar.gz: 74ad243c626ed4e11cc006dd29e2a5bedf77a2ef50ad8c726d2434ecb0ae6f168a5347db3cbbb154afcf968e3a728067382be1c1ce456ad71ea802dc3ce78e81

data/README.md

@@ -28,7 +28,7 @@ Signals `USR1`, `USR2` are forwarded to the children.
     
     $ kill -TTIN masterpid
     
-`TTOU` kills one child
+`TTOU` stops one child
     
     $ kill -TTOU masterpid
     

data/lib/sidekiq/pool/cli.rb

@@ -4,7 +4,6 @@ module Sidekiq
   module Pool
     class CLI < Sidekiq::CLI
       def initialize
-        @master_pid = ::Process.pid
         @child_index = 0
         @pool = []
         super
@@ -14,6 +13,9 @@ module Sidekiq
 
       def run
         logger.info "Starting pool with #{@pool_size} instances"
+
+        @master_pid = $$
+
         trap_signals
 
         @pool_size.times { fork_child }
@@ -104,7 +106,7 @@ module Sidekiq
       def trap_signals
         @self_read, @self_write = IO.pipe
 
-        %w(INT TERM USR1 USR2 TTIN TTOU CLD).each do |sig|
+        %w(INT TERM USR1 USR2 TTIN TTOU CHLD).each do |sig|
           begin
             trap sig do
               @self_write.puts(sig) unless fork?
@@ -140,7 +142,7 @@ module Sidekiq
           add_child
         when 'TTOU'
           remove_child
-        when 'CLD'
+        when 'CHLD'
           check_pool
         when 'USR1', 'USR2'
           logger.info "Sending #{sig} signal to the pool"
@@ -176,6 +178,7 @@ module Sidekiq
       end
 
       def check_pool
+        ::Process.waitpid2(-1, ::Process::WNOHANG)
         @pool.each do |pid|
           next if alive?(pid)
           handle_dead_child(pid)
@@ -201,12 +204,13 @@ module Sidekiq
         loop do
           signal_to_pool('TERM')
           sleep(1)
+          ::Process.waitpid2(-1, ::Process::WNOHANG)
           break if @pool.none? { |pid| alive?(pid) }
         end
       end
 
       def fork?
-        ::Process.pid != @master_pid
+        $$ != @master_pid
       end
     end
   end

data/lib/sidekiq/pool/version.rb

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

metadata

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