sidekiq-pool 1.8.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca3fa913c595d916c0df9e2897c6047fae80eef1f78e3a7e53779874c9e3ade9
-  data.tar.gz: 20d365396e1a193714f91a8c80dc625e29e1d309acd66ce9f6b53de38e603619
+  metadata.gz: 6ec19ae3f1256d1c291c33af8c7e95ab8aa2139b519035947ce7206b5e1af32c
+  data.tar.gz: 8a7f862dcb0729c9ea68c87a33307a167e62475915e5ffc8f688f367258dcd9b
 SHA512:
-  metadata.gz: 8138fb77f6ca5e6601955f513ad5a0d0ed2953f87f1e1179aa575fc7e8d6d43fb5b995497d34babf70e6c3be168cef5c59cc3c289abeb55a4cd0ae1676790c41
-  data.tar.gz: 054f960402c6888ede263ab667389fc3bbaf0d1352b3acf7f040b0d6bb57f18f251de2d4ac99207fc48bdad42a45ac204f12fb4dc906457014f4527723ffb91b
+  metadata.gz: ac9432289be3890128ed433dbff50f3df482418d966e8af02ad99045554745f4b71504b03985772e2ea8afbb283b193fd9553c2c8056a8aa1fff44a2ff2586cd
+  data.tar.gz: cf1ffe878314497d4559561dba70bfe282e128b78a5ef7aa4ae61e2a101cba693b9041fa6429a929845ca35d8abdcbb20b6c18f3cc59ade5af61af77015299dc

data/lib/sidekiq/pool/cli.rb

@@ -11,7 +11,6 @@ module Sidekiq
       }
 
       def initialize
-        @child_index = 0
         @pool = []
         @done = false
         @system_booted = false
@@ -20,8 +19,13 @@ module Sidekiq
 
       alias_method :run_child, :run
 
+      def write_pid
+        super if @master_pid == ::Process.pid
+      end
+
       def run
         @master_pid = $$
+        write_pid
 
         trap_signals
         update_process_name
@@ -69,10 +73,12 @@ module Sidekiq
         boot_system
 
         @types = @settings[:workers]
+        index = -1
         @types.each do |type|
           type[:amount].times do
+            index += 1
             sleep @fork_wait || DEFAULT_FORK_WAIT
-            fork_child(type[:command])
+            fork_child(type[:command], index)
           end
         end
         drop_reload_marker
@@ -189,7 +195,7 @@ module Sidekiq
         end
       end
 
-      def fork_child(command, wait_for_busy = true)
+      def fork_child(command, index, wait_for_busy = true)
         logger.info "Adding child with args: (#{command}) in #{working_directory}, waiting for busy: #{wait_for_busy}"
         if working_directory && !Dir.exist?(working_directory)
           logger.info "Working directory: #{working_directory} does not exist unable to fork"
@@ -202,14 +208,14 @@ module Sidekiq
           options.merge!(opts)
 
           @self_write.close
-          $0 = 'sidekiq starting'
-          @child_index += 1
-          options[:index] = @child_index
+          $0 = "sidekiq #{Sidekiq::VERSION} worker #{index} starting"
+          options[:index] = index
 
           # reset child identity
           @@process_nonce = nil
           @@identity = nil
           options[:identity] = identity
+          options[:tag] = "worker #{index}"
 
           run_after_fork_hooks
           run_child
@@ -223,7 +229,7 @@ module Sidekiq
           sleep 1
         end if wait_for_busy
 
-        @pool << { pid: pid, command: command }
+        @pool << { pid: pid, index: index, command: command }
       end
 
       def wait_for_signals
@@ -309,9 +315,9 @@ module Sidekiq
       end
 
       def handle_dead_child(child)
-        logger.info "Child #{child[:pid]} died"
+        logger.info "Child #{child[:pid]} (worker #{child[:index]}) died"
         @pool.delete(child)
-        fork_child(child[:command], false)
+        fork_child(child[:command], child[:index], false)
       end
 
       def alive?(pid)

data/lib/sidekiq/pool/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Pool
-    VERSION = '1.8.1'
+    VERSION = '1.9.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pool
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Vinted
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq