sidekiq-pool 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a570cfb2092036b76f35e89ea276f9eb39b7b68645213257a739ae0e7b1d25d
-  data.tar.gz: 10c418961feaa04d49c0e8c23faefe55c56a4d06a2ea1cf9b57e48958c0ec46d
+  metadata.gz: bf98a1a08f14125a21317d2846177402c75beea40e6204e63889db1bd43320ca
+  data.tar.gz: f3d39f372b981c12c312e4cd76fd7788bcdcea1122aa320fa12290195798eaaf
 SHA512:
-  metadata.gz: 8f88af075fa30a0ef809ec9874cd04ee8794015152e118146bda044ea303828426a67c577e3b7cb141849676fe81dec2b6a41e04737e79a39d34ff39f68bec50
-  data.tar.gz: e2384bb4207be796b44d45f3f83dbed467cdbbb2bb90b33abdb14cf870545d7e096a2fad8e615f8dd9b068bf18eae030ae300b291be16ea27f8856089dd07469
+  metadata.gz: f23137a068a0e6d9a8736df5104875b88c7ed0e70189ad7753cea33c5c62a3e522be30556745b63b1c8ec2656eea135739b361adc70196ec604b2cc3f2ce7d3f
+  data.tar.gz: f82f7f8bed62b0f5e8768c35710eadbb938c21609a0493a050a5227c7b75276e3bd196d123ecbabe2f8bda6976a03c426d2a81171caf6e46194f36bfdc4d223e

data/lib/sidekiq/pool/cli.rb

@@ -11,7 +11,6 @@ module Sidekiq
       }
 
       def initialize
-        @child_index = 0
         @pool = []
         @done = false
         @system_booted = false
@@ -74,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
@@ -194,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"
@@ -208,13 +209,13 @@ module Sidekiq
 
           @self_write.close
           $0 = 'sidekiq starting'
-          @child_index += 1
-          options[:index] = @child_index
+          options[:index] = index
 
           # reset child identity
           @@process_nonce = nil
           @@identity = nil
           options[:identity] = identity
+          options[:tag] = "worker #{index}"
 
           run_after_fork_hooks
           run_child
@@ -228,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
@@ -314,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.9.0'
+    VERSION = '1.9.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pool
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Vinted
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq