sidekiq-pool 1.9.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a570cfb2092036b76f35e89ea276f9eb39b7b68645213257a739ae0e7b1d25d
-  data.tar.gz: 10c418961feaa04d49c0e8c23faefe55c56a4d06a2ea1cf9b57e48958c0ec46d
+  metadata.gz: b48af9b55e63a374a5843de9295d3a56faf1e2a7cd8af3120963584818b4be48
+  data.tar.gz: 9b3c20e527f34b48da3459037a5a491722f5b6c934288bbbcf1203bb0d7e9100
 SHA512:
-  metadata.gz: 8f88af075fa30a0ef809ec9874cd04ee8794015152e118146bda044ea303828426a67c577e3b7cb141849676fe81dec2b6a41e04737e79a39d34ff39f68bec50
-  data.tar.gz: e2384bb4207be796b44d45f3f83dbed467cdbbb2bb90b33abdb14cf870545d7e096a2fad8e615f8dd9b068bf18eae030ae300b291be16ea27f8856089dd07469
+  metadata.gz: 433e5d5109862b240d7bb2fafb211164b2f4394d9ec49e094fb816cbb415be546d5f4c0561ede18665d2037a5c2c09ce4aa8b1d3518bdea9e4920a918965e5ad
+  data.tar.gz: c03c4008bfe19ec580f6e0d9f4a5743a6a9451ea6e864e5446657b11e78c0835ea6002ce50112e2344721795f5960cbfcdc06ba520afb94021380712deea2045

data/.github/workflows/build_release_pipeline.yaml

@@ -1,4 +1,4 @@
-name: Build and release ruby gem
+name: Test, build, and release Ruby gem
 
 on:
   pull_request: 
@@ -7,23 +7,42 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-release-pipeline:
+  test:
     runs-on: ubuntu-latest
-    container: ruby:2.7.2
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '3.0', '3.1' ]
     steps:
       - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Setup
-        run: |
-          apt-get update -y && apt-get install -y --no-install-recommends cmake=3.13.4-1
-          gem install bundler
+        run: | 
           bundle install
-
       - name: Test
         run: bundle exec rake
+      
+  build-release-pipeline:
+    runs-on: ubuntu-latest
+    needs: test
+    if: success() && github.ref == 'refs/heads/master'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7'
+          bundler-cache: true
+      - name: Setup
+        run: | 
+          bundle install
 
       - name: Build
         id: build
-        if: success() && github.ref == 'refs/heads/master'
         run: |
           bundle exec rake build
           echo "::set-output name=gem_version::v$(bundle exec rake version)"
@@ -51,4 +70,3 @@ jobs:
               ref: "refs/tags/${{ steps.build.outputs.gem_version }}",
               sha: context.sha
             })
-            

data/.gitignore

@@ -1,7 +1,5 @@
-/.ruby-version
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.ruby-version

@@ -0,0 +1 @@
+3.0.4

data/Gemfile.lock

@@ -0,0 +1,129 @@
+PATH
+  remote: .
+  specs:
+    sidekiq-pool (2.0.1)
+      sidekiq (>= 3.0, < 7.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    coderay (1.1.3)
+    connection_pool (2.2.5)
+    diff-lcs (1.5.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    gitlab (4.18.0)
+      httparty (~> 0.18)
+      terminal-table (>= 1.5.1)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    octokit (4.22.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
+    pronto (0.11.0)
+      gitlab (~> 4.4, >= 4.4.0)
+      httparty (>= 0.13.7)
+      octokit (~> 4.7, >= 4.7.0)
+      rainbow (>= 2.2, < 4.0)
+      rexml (~> 3.2)
+      rugged (>= 0.23.0, < 1.1.0)
+      thor (>= 0.20.3, < 2.0)
+    pronto-rubocop (0.11.1)
+      pronto (~> 0.11.0)
+      rubocop (>= 0.63.1, < 2.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    redis (4.6.0)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    rugged (1.0.1)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    sidekiq (6.4.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    unicode-display_width (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  pronto-rubocop (~> 0.10)
+  pry
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  sidekiq-pool!
+
+BUNDLED WITH
+   2.2.33

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"
@@ -207,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
@@ -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 = '2.0.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: 2.0.1
 platform: ruby
 authors:
 - Vinted
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -98,7 +98,9 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -127,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Forks and manages multiple Sidekiq processes