sidekiq-redeploy 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cea8c0843186c17d2aef1fe3934519013d28e218329c9d9f6441f1c90724b525
-  data.tar.gz: cd5a48e0da3d2b73d13747f00280eb3d97981fefbf9466683ae9bb2a87a60747
+  metadata.gz: 8b4a9ea82326d3303e7b62977a3a124415b5b763ad3ab12e952fff7464794910
+  data.tar.gz: 9b876740e30131c3c6c4c3da743d04cb5922e616af690b1ad6561bb716e2e973
 SHA512:
-  metadata.gz: 057b2e567dab578271424a51cb65a2005c727e0ccf58daf76860cec13d01f0fd01e022e23836fc5eb8e770c921ee7716957b728c677d1a214b3705c4b458a9a2
-  data.tar.gz: 55db7a62095473d6d9a73eafe4ad52d2157e45f3fedd82cee0605197505bbe710724b3ea4aa157b699e662e71f7aa667212c301664179a86b759eab6ed4d4e83
+  metadata.gz: 28ac5b4d9853c1538e1db4a98144280d2814d3a3799a3e3e0297db54b470e2cc13b9c721e7d0cf0c8a37cc23b764581fa6206e524eb973b5b3633934b7aff4c1
+  data.tar.gz: a7699606e5abba66b5d2ef82b11317de3ece6042234ab45d1491b61ab8e2ceec1fcfa7c9d71a79c6242405fe773b21e0b16b73e46c221a465b65ace4c296589d

data/.rubocop.yml

@@ -19,7 +19,10 @@ Metrics/MethodLength:
   Max: 30
 
 Metrics/ClassLength:
-  Max: 120
+  Max: 140
+
+Metrics/AbcSize:
+  Max: 20
 
 RSpec/NestedGroups:
   Max: 4

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.1.9
+
+**Fixes and enhancements:**
+
+- Allow users to specify number of sidekiq worker processes with -n flag
+
+## v0.1.8
+
+**Fixes and enhancements:**
+
+- Allow sidekiq 7.x
 
 ## v0.1.6
 

data/README.md

@@ -40,6 +40,7 @@ Usage: sidekiq-loader [options]
     -y, --watch-delay INTEGER        [Optional] Specify the number of seconds between checking watch file. Defaults to 30.
     -d, --[no-]deploy  [FLAG]        [Optional] Deploy archive on app startup. Defaults to true.
     -s, --sidekiq-app [PATH|DIR]     [Optional] Location of application to pass to sidekiq.
+    -n, --num-procs INTEGER          [Optional] Specify the number of sidekiq processes to create. Defaults to 1.
 ```
 
 For example this will start the launcher using a S3 watch file.

data/bin/sidekiq-loader

@@ -13,7 +13,8 @@ def run_sidekiq(ops, logger)
   deployer.deploy(source: deployer.archive_file) if ops[:deploy]
   config = { watch_delay: ops[:watch_delay] }
 
-  Sidekiq::Redeploy::Loader.new(deployer:, logger:, sidekiq_app: ops[:sidekiq_app], config:).run
+  Sidekiq::Redeploy::Loader.new(deployer:, logger:, sidekiq_app: ops[:sidekiq_app], config:,
+                                num_processes: ops[:num_processes]).run
 end
 
 def option_parser(opts)
@@ -39,6 +40,11 @@ def option_parser(opts)
     o.on '-s', '--sidekiq-app [PATH|DIR]', '[Optional] Location of application to pass to sidekiq.' do |arg|
       opts[:sidekiq_app] = arg
     end
+
+    o.on '-n', '--num-procs INTEGER', Integer,
+         '[Optional] Specify the number of sidekiq processes to create. Defaults to 1.' do |arg|
+      opts[:num_processes] = arg
+    end
   end
 end
 

data/lib/sidekiq/redeploy/loader.rb

@@ -15,9 +15,8 @@ module Sidekiq
 
       SIGNALS = [INT, TERM, USR2, TTIN].freeze
 
-      def initialize(deployer:, sidekiq_app: nil, logger: Logger.new($stdout), config: {})
+      def initialize(deployer:, sidekiq_app: nil, logger: Logger.new($stdout), config: {}, num_processes: 1)
         require 'sidekiq/cli'
-
         @reload_sidekiq = false
         @exit_loader = false
         @loader_pid = ::Process.pid
@@ -28,6 +27,8 @@ module Sidekiq
         @loop_delay = config[:loop_delay] || 0.5
         @deployer = deployer
         @sidekiq_app = sidekiq_app
+        @num_processes = num_processes || 1
+        @sidekiq_pids = []
       end
 
       def run
@@ -46,7 +47,7 @@ module Sidekiq
       rescue StandardError => e
         log "Error in sidekiq loader: #{e.message}"
         log e.backtrace.join("\n")
-        stop_sidekiq(@sidekiq_pid)
+        stop_sidekiq(@sidekiq_pids)
         ::Process.waitall
         exit 1
       end
@@ -62,12 +63,12 @@ module Sidekiq
             reload_app { deployer.deploy(source: deployer.archive_file) }
           elsif reload_sidekiq
             reload_app
-          elsif process_died?(@sidekiq_pid)
-            fork_sidekiq
           end
+          @sidekiq_pids = running_pids(@sidekiq_pids)
+          fork_sidekiq(@num_processes - @sidekiq_pids.length) if @sidekiq_pids.length < @num_processes
           next unless exit_loader
 
-          stop_sidekiq(@sidekiq_pid)
+          stop_sidekiq(@sidekiq_pids)
           break
         end
       end
@@ -80,30 +81,32 @@ module Sidekiq
       end
 
       def reload_app
-        quiet_sidekiq(@sidekiq_pid)
+        quiet_sidekiq(@sidekiq_pids)
 
         yield if block_given?
 
-        stop_sidekiq(@sidekiq_pid)
+        stop_sidekiq(@sidekiq_pids)
 
         # wait for sidekiq to stop
         ::Process.waitall
-
         fork_sidekiq
         @reload_sidekiq = false
       end
 
-      def fork_sidekiq
-        @sidekiq_pid = ::Process.fork do
-          cli = Sidekiq::CLI.instance
-          args = @sidekiq_app ? ['-r', @sidekiq_app] : []
-          cli.parse(args)
-          cli.run
-        rescue StandardError => e
-          message = "Error loading sidekiq process: #{e.message}"
-          log message
-          log e.backtrace.join("\n")
-          raise message
+      def fork_sidekiq(num_children = @num_processes)
+        num_children.times do
+          pid = ::Process.fork do
+            cli = Sidekiq::CLI.instance
+            args = @sidekiq_app ? ['-r', @sidekiq_app] : []
+            cli.parse(args)
+            cli.run
+          rescue StandardError => e
+            message = "Error loading sidekiq process: #{e.message}"
+            log message
+            log e.backtrace.join("\n")
+            raise message
+          end
+          @sidekiq_pids << pid
         end
       end
 
@@ -126,32 +129,41 @@ module Sidekiq
         when USR2
           @reload_sidekiq = true
         when TTIN
-          ::Process.kill(signal, @sidekiq_pid)
+          @sidekiq_pids.each do |pid|
+            ::Process.kill(signal, pid)
+          end
         when TERM, INT
           @exit_loader = true
         end
       end
 
       def debug_handler(signal)
-        log_data = { signal:, current_pid: ::Process.pid, loader_pid: @loader_pid, sidekiq_pid: @sidekiq_pid,
+        log_data = { signal:, current_pid: ::Process.pid, loader_pid: @loader_pid, sidekiq_pids: @sidekiq_pids,
                      reload_sidekiq: @reload_sidekiq, exit_loader: @exit_loader }
         puts "handle_signal called with #{log_data}"
       end
 
-      def stop_sidekiq(pid)
-        ::Process.kill(TERM, pid) if pid
+      def stop_sidekiq(pids)
+        pids.each do |pid|
+          ::Process.kill(TERM, pid)
+        end
+        @sidekiq_pids = []
       end
 
-      def quiet_sidekiq(pid)
-        ::Process.kill(TSTP, pid) if pid
+      def quiet_sidekiq(pids)
+        pids.each do |pid|
+          ::Process.kill(TSTP, pid)
+        end
       end
 
-      def process_died?(pid)
-        return false if @exit_loader
-
-        !::Process.getpgid(pid)
-      rescue StandardError
-        true
+      def running_pids(pids)
+        new_pids = []
+        pids.each do |pid|
+          new_pids << pid unless ::Process.waitpid(pid, ::Process::WNOHANG)
+        rescue Errno::ECHILD
+          log "PID #{pid} does not exist."
+        end
+        new_pids
       end
 
       def log(message)

data/lib/sidekiq/redeploy/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Redeploy
-    VERSION = '0.1.7'
+    VERSION = '0.1.9'
   end
 end

data/sidekiq-redeploy.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'puma-redeploy', '~> 0.3.3'
-  spec.add_dependency 'sidekiq', '~> 6.0'
+  spec.add_dependency 'sidekiq', '>= 6', '< 8'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-redeploy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - tbeauvais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma-redeploy
@@ -28,16 +28,22 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 description: Sidekiq launcher to redeploy and reload app from a remote artifact. This
   will detect app changes, once detected a new artifact will be pulled and the Sidekiq
   app will be reloaded.