sidekiq-pool 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbcd18cd80b67101d003aae7aef8f1747357de29536bbb9ebaabc85baf2768a5
-  data.tar.gz: 628eb6ba736ecf768bab6bc7d336480c20bfbd3c4152eaf3f521977448d26041
+  metadata.gz: bf98a1a08f14125a21317d2846177402c75beea40e6204e63889db1bd43320ca
+  data.tar.gz: f3d39f372b981c12c312e4cd76fd7788bcdcea1122aa320fa12290195798eaaf
 SHA512:
-  metadata.gz: 16ef09872093ea84ff7ef3c2082332443ba1973185ffc900b30a8e41ddb4c1f53f7ba85d298eb652d817c4a7e9c68a0034a89d1f5819a4cc1fce93c07da31b91
-  data.tar.gz: 9a3536806744212ea3de7f3f5f814a39c028361f9193afa85cc1300b0dfd5fefc108d2de98cafb0b3f0e8637e0347c8edaec0b36daa70715af0ab78c9d866329
+  metadata.gz: f23137a068a0e6d9a8736df5104875b88c7ed0e70189ad7753cea33c5c62a3e522be30556745b63b1c8ec2656eea135739b361adc70196ec604b2cc3f2ce7d3f
+  data.tar.gz: f82f7f8bed62b0f5e8768c35710eadbb938c21609a0493a050a5227c7b75276e3bd196d123ecbabe2f8bda6976a03c426d2a81171caf6e46194f36bfdc4d223e

data/.github/workflows/build_release_pipeline.yaml

@@ -0,0 +1,54 @@
+name: Build and release ruby gem
+
+on:
+  pull_request: 
+    branches: [ master ]
+  push:
+  workflow_dispatch:
+
+jobs:
+  build-release-pipeline:
+    runs-on: ubuntu-latest
+    container: ruby:2.7.2
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup
+        run: |
+          apt-get update -y && apt-get install -y --no-install-recommends cmake=3.13.4-1
+          gem install bundler
+          bundle install
+
+      - name: Test
+        run: bundle exec rake
+
+      - 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)"
+
+      - name: Release
+        if: success() && github.ref == 'refs/heads/master'
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem push pkg/*
+        env:
+          GEM_HOST_API_KEY: "${{ secrets.RUBYGEMS_AUTH_TOKEN }}"
+
+      - name: Tag repo with new gem version
+        if: success() && github.ref == 'refs/heads/master'
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{ github.token }}
+          script: |
+            github.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: "refs/tags/${{ steps.build.outputs.gem_version }}",
+              sha: context.sha
+            })
+            

data/Rakefile

@@ -4,3 +4,7 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :version do |t|
+  puts Sidekiq::Pool::VERSION
+end

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"
@@ -203,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
@@ -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.0'
+    VERSION = '1.9.1'
   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', 'Raimondas Valickas']
-  spec.email         = ['laurynas.butkus@gmail.com', 'raimondas.valickas@gmail.com']
+  spec.authors       = ['Vinted']
+  spec.email         = ['backend@vinted.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,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pool
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
-- Laurynas Butkus
-- Raimondas Valickas
+- Vinted
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -89,17 +88,16 @@ dependencies:
         version: '3.0'
 description: Allows Sidekiq using more CPU cores on Ruby MRI by forking multiple processes.
 email:
-- laurynas.butkus@gmail.com
-- raimondas.valickas@gmail.com
+- backend@vinted.com
 executables:
 - sidekiq-pool
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build_release_pipeline.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Forks and manages multiple Sidekiq processes

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.7.0
-  - 2.6.5
-  - 2.5.1
-  - 2.4.1
-  - 2.3.4
-before_install: gem install bundler
-after_success:
-- >
-  [ "${TRAVIS_PULL_REQUEST}" != "false" ] &&
-  [ "${TRAVIS_RUBY_VERSION}" = "2.5.1" ] &&
-    PRONTO_PULL_REQUEST_ID=${TRAVIS_PULL_REQUEST} \
-      bundle exec pronto run -f github_status github_pr -c origin/${TRAVIS_BRANCH}