sidekiq-pool 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f398c3a7872ba4a1fc067774741fea66e52f23dd
-  data.tar.gz: b296394a24798e387dfde35e67a7682653509c24
+  metadata.gz: aae2717b1470d3fe230ee71d92ed00e2c8a657ab
+  data.tar.gz: 28320e8f8244f32866a8e8791f36f16e896cc0d5
 SHA512:
-  metadata.gz: 95a3517a34ee42621ce2cf6f3dabe722db1ff51ed215e28005b2167dd7bc7d4da5684d3305b245ac132f5740887428d927edeea9d8e04683a839ffc937eaf8dd
-  data.tar.gz: bddba9d1436f510522c9afb43ddd5fb09acccee120d786cec3c1da75d0422ec115ee630d3105d46702aa2f9be1f80f7ee84daa123e4c7433c2efd57988008329
+  metadata.gz: 21a5f70aa506b01a412796dd17ca62891cc152f07474eb8e44b649e0a5d9f8e476bca86831b3dfc280b183628c26e23e668d77c3c5f3d39e1248154497699b26
+  data.tar.gz: c7d6a1d24110e31198e465b51524e78586b5b05010468c027706baa54da757ce06cb116e412af62da4945e7faa7526e3244b0155f1f95e82818e994eea0a40f6

data/bin/sidekiq-pool

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-# Quiet some warnings we see when running in warning mode:
-# RUBYOPT=-w bundle exec sidekiq-pool
 $TESTING = false
 
 require_relative '../lib/sidekiq/pool/cli'

data/lib/sidekiq/pool/cli.rb

@@ -4,10 +4,17 @@ require 'sidekiq/pool/version'
 module Sidekiq
   module Pool
     class CLI < Sidekiq::CLI
+
+      START_CTX = {
+        :argv => ARGV.map(&:dup),
+        0 => $0.dup,
+      }
+
       def initialize
         @child_index = 0
         @pool = []
         @done = false
+        @system_booted = false
         super
       end
 
@@ -41,6 +48,15 @@ module Sidekiq
 
       DEFAULT_FORK_WAIT = 1
 
+      def boot_system
+        if @system_booted
+          logger.info "#{::Process.pid} - environment already started"
+        else
+          super
+          @system_booted = true
+        end
+      end
+
       def working_directory
         @working_directory || @settings[:working_directory]
       end
@@ -49,6 +65,9 @@ module Sidekiq
         logger.info 'Starting new pool'
         @settings = parse_config_file(@pool_config)
         Dir.chdir(working_directory) if working_directory
+
+        boot_system
+
         @types = @settings[:workers]
         @types.each do |type|
           type[:amount].times do
@@ -56,6 +75,7 @@ module Sidekiq
             fork_child(type[:command])
           end
         end
+        drop_reload_marker
       end
 
       def parse_options(argv)
@@ -228,25 +248,43 @@ module Sidekiq
           logger.info "Sending #{sig} signal to the pool"
           signal_to_pool(sig)
         when 'HUP'
-          logger.info 'Gracefully reloading pool'
-          old_pool = @pool.dup
+          reload
+        end
+      end
+
+      def reload
+        logger.info 'Gracefully reloading pool'
 
-          # Signal old pool
-          # USR1 tells Sidekiq it will be shutting down in near future.
-          signal_to_pool('USR1') if @suspend_before_graceful_reload
+        # USR1 tells Sidekiq it will be shutting down in near future.
+        signal_to_pool('USR1') if @suspend_before_graceful_reload
 
-          # Reset pool
-          @pool = []
+        add_reload_marker
+        reexec
 
-          # Start new pool
-          start_new_pool
+        stop_children
+        logger.info 'Graceful reload completed'
+      ensure
+        exit(0)
+      end
 
-          # Stop old pool
-          stop_children(old_pool)
-          logger.info 'Graceful reload completed'
+      def reexec
+        fork do
+          cmd = [START_CTX[0]].concat(START_CTX[:argv])
+          logger.info("Starting new master process #{cmd}")
+          exec(*cmd)
         end
       end
 
+      def add_reload_marker
+        return unless options[:pidfile]
+        File.write([options[:pidfile], '.reload'].join, '')
+      end
+
+      def drop_reload_marker
+        reload_marker = [options[:pidfile], '.reload'].join
+        File.unlink(reload_marker) if File.exist?(reload_marker)
+      end
+
       def signal_to_pool(sig, given_pool = @pool)
         given_pool.each { |child| signal_to_child(sig, child[:pid]) }
       end

data/lib/sidekiq/pool/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Pool
-    VERSION = '1.5.4'
+    VERSION = '1.6.0'
   end
 end

data/sidekiq-pool.gemspec

@@ -6,8 +6,8 @@ require 'sidekiq/pool/version'
 Gem::Specification.new do |spec|
   spec.name          = 'sidekiq-pool'
   spec.version       = Sidekiq::Pool::VERSION
-  spec.authors       = ['Laurynas Butkus']
-  spec.email         = ['laurynas.butkus@gmail.com']
+  spec.authors       = ['Laurynas Butkus', 'Raimondas Valickas']
+  spec.email         = ['laurynas.butkus@gmail.com', 'raimondas.valickas@gmail.com']
 
   spec.summary       = %q{Forks and manages multiple Sidekiq processes}
   spec.description   = %q{Allows Sidekiq using more CPU cores on Ruby MRI by forking multiple processes.}

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pool
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Laurynas Butkus
+- Raimondas Valickas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -75,6 +76,7 @@ dependencies:
 description: Allows Sidekiq using more CPU cores on Ruby MRI by forking multiple processes.
 email:
 - laurynas.butkus@gmail.com
+- raimondas.valickas@gmail.com
 executables:
 - sidekiq-pool
 extensions: []