sidekiq-pool 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 776f60e5732aaa7c89050bc670fd2d484460ae16
-  data.tar.gz: fd47cc8507e4b72fdfc00895b9632eead8abbc00
+  metadata.gz: b18df834e83b27a7507863976c2af09c93fea20d
+  data.tar.gz: 197cf40e14dda748bf363f33324fc753878de775
 SHA512:
-  metadata.gz: b7fb8b535f3eb9b3197e43ab256f5cf140f9fc73bcaf8d51288959a80cd5afaf40fca850eb547f5ac77a37c2616b7e1910c831e43e7602819d60c24cc4be3c60
-  data.tar.gz: 2d49c444e7f49f45941858b7c38912731a042b70a2c584e4ef57fcb505f19a01b0d25cb9160875f208f28285021d5dc408c4f84b5367300b0c52be1c94645720
+  metadata.gz: 7fa18f3e36552979d1d0ae685323ef145fb3cdf5e8ce2eb3f8ba9825c8001829bf46b57481d9daffba77cbcb65262da67818416ed68352fde1e2436fe272b5bf
+  data.tar.gz: c4ccef02df6cfa61e0ef0263769e987953107b3949faaad1d8a0ee22351fdca799b0cb439b41c1517b63580f8586d6bc3fb17bfb1b496e63db73b3db2ec9c89a

data/README.md

@@ -1,6 +1,6 @@
 # Sidekiq::Pool
 
-Allows using more CPU cores with Sidekiq on Ruby MRI by forking multiple processes.
+Allows Sidekiq using more CPU cores on Ruby MRI by forking multiple processes.
 
 ## Installation
 
@@ -36,7 +36,6 @@ Signals `USR1`, `USR2` are forwarded to the children.
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/laurynas/sidekiq-pool.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/sidekiq/pool/cli.rb

@@ -4,6 +4,7 @@ module Sidekiq
   module Pool
     class CLI < Sidekiq::CLI
       def initialize
+        @master_pid = ::Process.pid
         @child_index = 0
         @pool = []
         super
@@ -12,28 +13,12 @@ module Sidekiq
       alias_method :run_child, :run
 
       def run
-        raise ArgumentError, 'Please specify pool size' unless @pool_size
-
-        self_read, self_write = IO.pipe
-
-        %w(INT TERM USR1 USR2 TTIN TTOU CLD).each do |sig|
-          begin
-            trap sig do
-              self_write.puts(sig)
-            end
-          rescue ArgumentError
-            puts "Signal #{sig} not supported"
-          end
-        end
-
         logger.info "Starting pool with #{@pool_size} instances"
+        trap_signals
 
         @pool_size.times { fork_child }
 
-        while readable_io = IO.select([self_read])
-          signal = readable_io.first[0].gets.strip
-          handle_master_signal(signal)
-        end
+        wait_for_signals
       end
 
       private
@@ -111,28 +96,61 @@ module Sidekiq
         opts
       end
 
+      def validate!
+        raise ArgumentError, 'Please specify pool size using --pool-size N' unless @pool_size
+        super
+      end
+
+      def trap_signals
+        @self_read, @self_write = IO.pipe
+
+        %w(INT TERM USR1 USR2 TTIN TTOU CLD).each do |sig|
+          begin
+            trap sig do
+              @self_write.puts(sig) unless fork?
+            end
+          rescue ArgumentError
+            puts "Signal #{sig} not supported"
+          end
+        end
+      end
+
+      def fork_child
+        @pool << fork do
+          @self_write.close
+          options[:index] = @child_index++
+          run_child
+        end
+      end
+
+      def wait_for_signals
+        while readable_io = IO.select([@self_read])
+          signal = readable_io.first[0].gets.strip
+          handle_master_signal(signal)
+        end
+      end
+
       def handle_master_signal(sig)
         case sig
         when 'INT', 'TERM'
-          signal_to_pool(sig)
-          wait_and_exit
+          stop_children
+          logger.info 'Bye!'
+          exit(0)
         when 'TTIN'
-          logger.info 'Adding child'
-          fork_child
+          add_child
         when 'TTOU'
           remove_child
         when 'CLD'
           check_pool
-        else
+        when 'USR1', 'USR2'
+          logger.info "Sending #{sig} signal to the pool"
           signal_to_pool(sig)
         end
       end
 
-      def fork_child
-        @pool << fork do
-          options[:index] = @child_index++
-          run_child
-        end
+      def add_child
+        logger.info 'Adding child'
+        fork_child
       end
 
       def remove_child
@@ -144,12 +162,17 @@ module Sidekiq
         end
 
         logger.info 'Removing child'
-        ::Process.kill('TERM', @pool.pop)
+        signal_to_child('TERM', @pool.shift)
       end
 
       def signal_to_pool(sig)
-        logger.info "Sending #{sig} signal to the pool"
-        @pool.each { |pid| ::Process.kill(sig, pid) }
+        @pool.each { |pid| signal_to_child(sig, pid) }
+      end
+
+      def signal_to_child(sig, pid)
+        ::Process.kill(sig, pid)
+      rescue Errno::ESRCH
+        @pool.delete(pid)
       end
 
       def check_pool
@@ -162,6 +185,7 @@ module Sidekiq
       def handle_dead_child(pid)
         logger.info "Child #{pid} died"
         @pool.delete(pid)
+        add_child
       end
 
       def alive?(pid)
@@ -171,14 +195,18 @@ module Sidekiq
         false
       end
 
-      def wait_and_exit
+      def stop_children
+        logger.info 'Stopping children'
+
         loop do
+          signal_to_pool('TERM')
+          sleep(1)
           break if @pool.none? { |pid| alive?(pid) }
-          sleep(0.1)
         end
+      end
 
-        logger.info 'Bye!'
-        exit(0)
+      def fork?
+        ::Process.pid != @master_pid
       end
     end
   end

data/lib/sidekiq/pool/version.rb

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

data/sidekiq-pool.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['laurynas.butkus@gmail.com']
 
   spec.summary       = %q{Forks and manages multiple Sidekiq processes}
-  spec.description   = %q{Allows using more CPU cores with Sidekiq on Ruby MRI by forking multiple processes.}
+  spec.description   = %q{Allows Sidekiq using more CPU cores on Ruby MRI by forking multiple processes.}
   spec.homepage      = 'https://github.com/laurynas/sidekiq-pool'
   spec.license       = 'MIT'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Laurynas Butkus
@@ -66,8 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Allows using more CPU cores with Sidekiq on Ruby MRI by forking multiple
-  processes.
+description: Allows Sidekiq using more CPU cores on Ruby MRI by forking multiple processes.
 email:
 - laurynas.butkus@gmail.com
 executables: