sidekiq-pool 0.1.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2728fe9ae5b84fa988903d628cbad0f324c36f
-  data.tar.gz: 4e52dd10fb17ec666e0a6d88adb285fb193df8e3
+  metadata.gz: e74bb16b2feb36fa68a28e744185d26383037361
+  data.tar.gz: 9a00a58fca89b6fb52f389f88ceb29d65a6d6e61
 SHA512:
-  metadata.gz: 030ad8a026626669776b71838b70f5a0a0146feb96e84b851bd3104b773df9b795686a831c5e513a0356ca51fd13d9ffe64517f1f6cdc40df6ee01273d05b663
-  data.tar.gz: 3ab4d8c7af989d4cc2f597b9f7574d434fb57b2ff405592af343c3c499cdb145b2fcc449dfcbf09a4202e245baeafefe9d97db1a81a78a07e3766e1aff5f68d6
+  metadata.gz: 1cbccc3d4aab0e5ef4c6e8d50fd001ced4efb6b67cfa74e2d23508f6e986e8fc72ec75d9e33cef23433c41c5ffc82d4e5b3ab237a6597193f05c373198627eaa
+  data.tar.gz: 70dd6d7a38ade7d05470aff93906659cb4aca5944f77ec00c786b07c3c14dc58d45d3f2fbe0bedc784320ec1c48370afc77bdf6a4245a796b9a6f1f12bc34cb4

data/README.md

@@ -1,6 +1,7 @@
 # Sidekiq::Pool
 
 Allows Sidekiq using more CPU cores on Ruby MRI by forking multiple processes.
+Also adds an option to use different command line option workers in the same pool.
 
 ## Installation
 
@@ -10,28 +11,34 @@ Add this line to your application's Gemfile:
 gem 'sidekiq-pool'
 ```
 
+Create a config file and specify it's path with the *p* command line option (the default is config/sidekiq-pool.yml)
+
+Paste the following config and modify it to your needs:
+
+```yaml
+:workers:
+  -
+    :command: '-q default -q high'
+    :amount: 2
+  -
+    :command: '-q high -L high_logfile.txt'
+    :amount: 1
+```
+
 ## Usage
 
 Help
 
     $ bundle exec sidekiq-pool -h
 
-Start pool with 3 instances
+Start pool with a non-default path config
 
-    $ bundle exec sidekiq-pool --pool-size 3 
+    $ bundle exec sidekiq-pool -p config/pool_config.yml
 
 ## Signals
 
 Signals `USR1`, `USR2` are forwarded to the children.
- 
-`TTIN` forks new child 
-    
-    $ kill -TTIN masterpid
-    
-`TTOU` stops one child
-    
-    $ kill -TTOU masterpid
-    
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/laurynas/sidekiq-pool.

data/lib/sidekiq/pool/cli.rb

@@ -14,21 +14,36 @@ module Sidekiq
       alias_method :run_child, :run
 
       def run
-        logger.info "Starting pool with #{@pool_size} instances"
-
+        @settings = parse_config_file(@pool_config)
+        @types = @settings[:workers]
         @master_pid = $$
 
         trap_signals
         update_process_name
-
-        @pool_size.times do
-          sleep @fork_wait || DEFAULT_FORK_WAIT
-          fork_child
+        @types.each do |type|
+          type[:amount].times do
+            sleep @fork_wait || DEFAULT_FORK_WAIT
+            add_child(type[:command])
+          end
         end
 
         wait_for_signals
       end
 
+      def parse_config_file(filename)
+        config = YAML.load(ERB.new(File.read(filename)).result)
+        unless config.key?(:workers)
+          raise ArgumentError, 'Invalid configuration file - "workers" key must be present'
+        end
+        unless config[:workers].is_a?(Array)
+          raise ArgumentError, 'Invalid configuration file - "workers" key must be a list'
+        end
+        unless config[:workers].size > 0
+          raise ArgumentError, 'Invalid configuration file - Atleast one worker must be present'
+        end
+        config
+      end
+
       private
 
       DEFAULT_FORK_WAIT = 1
@@ -37,10 +52,6 @@ module Sidekiq
         opts = {}
 
         @parser = OptionParser.new do |o|
-          o.on '--pool-size INT', "pool size" do |arg|
-            @pool_size = Integer(arg)
-          end
-
           o.on '-c', '--concurrency INT', "processor threads to use" do |arg|
             opts[:concurrency] = Integer(arg)
           end
@@ -90,6 +101,10 @@ module Sidekiq
             opts[:pidfile] = arg
           end
 
+          o.on '-p', '--pool-config PATH', "path to pool config file" do |arg|
+            @pool_config = arg
+          end
+
           o.on '-V', '--version', "Print version and exit" do |arg|
             puts "Sidekiq #{Sidekiq::VERSION}"
             die(0)
@@ -107,18 +122,17 @@ module Sidekiq
           opts[:config_file] ||= filename if File.exist?(filename)
         end
 
-        opts
-      end
+        %w[config/sidekiq-pool.yml config/sidekiq-pool.yml.erb].each do |filename|
+          @pool_config ||= filename if File.exist?(filename)
+        end
 
-      def validate!
-        raise ArgumentError, 'Please specify pool size using --pool-size N' unless @pool_size
-        super
+        opts
       end
 
       def trap_signals
         @self_read, @self_write = IO.pipe
 
-        %w(INT TERM USR1 USR2 TTIN TTOU CHLD).each do |sig|
+        %w(INT TERM USR1 USR2 CHLD).each do |sig|
           begin
             trap sig do
               @self_write.puts(sig) unless fork?
@@ -129,13 +143,15 @@ module Sidekiq
         end
       end
 
-      def fork_child
-        @pool << fork do
+      def fork_child(command)
+        pid = fork do
+          setup_options(command.split)
           @self_write.close
           $0 = 'sidekiq starting'
           options[:index] = @child_index++
           run_child
         end
+        @pool << { pid: pid, command: command }
       end
 
       def wait_for_signals
@@ -151,42 +167,25 @@ module Sidekiq
           stop_children
           logger.info 'Bye!'
           exit(0)
-        when 'TTIN'
-          add_child
-        when 'TTOU'
-          remove_child
         when 'CHLD'
           check_pool
         when 'USR1'
           @done = true
           update_process_name
-          logger.info "Sending #{sig} signal to the pool"
-          signal_to_pool(sig)
-        when 'USR2'
+        when 'USR1', 'USR2'
           logger.info "Sending #{sig} signal to the pool"
           signal_to_pool(sig)
         end
       end
 
-      def add_child
-        logger.info 'Adding child'
-        fork_child
+      def add_child(*arg)
+        logger.info "Adding child with args: #{arg}"
+        fork_child(*arg)
       end
 
-      def remove_child
-        return if @pool.empty?
-
-        if @pool.size == 1
-          logger.info 'Cowardly refusing to kill the last child'
-          return
-        end
-
-        logger.info 'Removing child'
-        signal_to_child('TERM', @pool.shift)
-      end
 
       def signal_to_pool(sig)
-        @pool.each { |pid| signal_to_child(sig, pid) }
+        @pool.each { |child| signal_to_child(sig, child[:pid]) }
       end
 
       def signal_to_child(sig, pid)
@@ -197,16 +196,16 @@ module Sidekiq
 
       def check_pool
         ::Process.waitpid2(-1, ::Process::WNOHANG)
-        @pool.each do |pid|
-          next if alive?(pid)
-          handle_dead_child(pid)
+        @pool.each do |child|
+          next if alive?(child[:pid])
+          handle_dead_child(child)
         end
       end
 
-      def handle_dead_child(pid)
-        logger.info "Child #{pid} died"
-        @pool.delete(pid)
-        add_child
+      def handle_dead_child(child)
+        logger.info "Child #{child[:pid]} died"
+        @pool.delete(child)
+        add_child(child[:command])
       end
 
       def alive?(pid)
@@ -232,7 +231,7 @@ module Sidekiq
           end
           sleep(1)
           ::Process.waitpid2(-1, ::Process::WNOHANG)
-          break if @pool.none? { |pid| alive?(pid) }
+          break if @pool.none? { |child| alive?(child[:pid]) }
         end
       end
 

data/lib/sidekiq/pool/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Pool
-    VERSION = '0.1.7'
+    VERSION = '1.0.0'
   end
 end

metadata

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