process_bot 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3abcda452c729ce0582b53ff117aa7ec8658d16ad52f05f7ff1be5e383e2422
-  data.tar.gz: 7499b97fa9e2ed082b739b241549baa4e511a5d0db0f024e921b4d174d842c20
+  metadata.gz: 7d79a43f8a6bdf408f637e66fff579115ab45f57f0c8c0314d98c1e84a8f4430
+  data.tar.gz: 716c9b8e69f54f1dc60a322d1ddad7f4336b464e338964ffa9f736d7cac11477
 SHA512:
-  metadata.gz: 3680d58298af7cb511b3e5007abfafadfd3457b22230936e36f0925d6f8245b07de3116356f28b6beb18bf5cb36b86604b5bfeb323aa357adb2313d9ac20d733
-  data.tar.gz: 4bbbafc629c0b3af2f47f1c82d3aab2bceeb003dd7820df85c5764427e654e96f08e232ee4e237f1df12e0c9a28fd807b0e9902ea1520c673902c79a95b0b3c8
+  metadata.gz: 2739cfa0148b5085b45f0ca273d583f609413346e7d7ebed3693fb3715ebeb2ad4c14475b212c82a86e3bc1081585f2edc606c0d2f7ae2159a61722cfc1bc0c1
+  data.tar.gz: f59153145d7e36da05d9d9dc98d6e7d2f0a3b8f03fcfb51606b800453685f2fcb45e07eca46395cbdeac095f041749eb2064b9f98bc6dfe1c5e7d3fad5611e35

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    process_bot (0.1.15)
+    process_bot (0.1.16)
       knjrbfw (>= 0.0.116)
       pry
       rake

data/README.md

@@ -44,6 +44,7 @@ ProcessBot provides these Sidekiq tasks:
 - `process_bot:sidekiq:stop`
 - `process_bot:sidekiq:graceful` (stops fetching new jobs and waits for running jobs by default)
 - `process_bot:sidekiq:graceful_no_wait` (stops fetching new jobs and returns immediately)
+- `process_bot:sidekiq:ensure_running` (starts missing processes, ignoring ones in graceful shutdown)
 - `process_bot:sidekiq:restart`
 
 You can also skip waiting for graceful completion:

data/lib/process_bot/capistrano/sidekiq.rake

@@ -70,6 +70,55 @@ namespace :process_bot do
       end
     end
 
+    desc "Ensure the configured number of Sidekiq ProcessBots are running (excluding graceful shutdowns)"
+    task :ensure_running do
+      on roles fetch(:sidekiq_roles) do |role|
+        git_plugin.switch_user(role) do
+          desired_processes = fetch(:sidekiq_processes).to_i
+          running_processes = git_plugin.running_process_bot_processes
+
+          graceful_processes = running_processes.select do |process_bot_data|
+            git_plugin.sidekiq_process_graceful?(process_bot_data)
+          end
+
+          active_processes = running_processes - graceful_processes
+
+          active_indexes = active_processes.filter_map do |process_bot_data|
+            git_plugin.process_bot_sidekiq_index(process_bot_data)
+          end
+
+          graceful_indexes = graceful_processes.filter_map do |process_bot_data|
+            git_plugin.process_bot_sidekiq_index(process_bot_data)
+          end
+
+          puts "ProcessBot Sidekiq in graceful shutdown: #{graceful_indexes.join(", ")}" if graceful_indexes.any?
+
+          desired_indexes = (0...desired_processes).to_a
+          missing_indexes = desired_indexes - active_indexes - graceful_indexes
+          missing_count = desired_processes - active_indexes.count
+
+          if missing_count.negative?
+            puts "Found #{active_indexes.count} running ProcessBot Sidekiq processes; desired is #{desired_processes}"
+            missing_count = 0
+          end
+
+          if missing_indexes.any?
+            missing_indexes.each do |idx|
+              puts "Starting Sidekiq with ProcessBot #{idx} (missing)"
+              git_plugin.start_sidekiq(idx)
+            end
+          else
+            puts "All ProcessBot Sidekiq processes are running (#{active_indexes.count}/#{desired_processes})"
+          end
+
+          return unless missing_count > missing_indexes.length
+
+          puts "Skipped starting #{missing_count - missing_indexes.length} processes because " \
+            "they are still in graceful shutdown"
+        end
+      end
+    end
+
     desc "Restart Sidekiq and ProcessBot"
     task :restart do
       invoke! "process_bot:sidekiq:stop"

data/lib/process_bot/capistrano/sidekiq_helpers.rb

@@ -93,6 +93,31 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     processes
   end
 
+  def process_bot_sidekiq_index(process_bot_data)
+    process_bot_id = process_bot_data["id"].to_s
+    match = process_bot_id.match(/-(\d+)\z/)
+    return nil unless match
+
+    match[1].to_i
+  end
+
+  def sidekiq_command_graceful?(command)
+    return false unless command
+
+    normalized_command = command.to_s.downcase
+    normalized_command.include?("stopping") || normalized_command.include?("quiet")
+  end
+
+  def sidekiq_process_graceful?(process_bot_data)
+    sidekiq_pid = process_bot_data["pid"]
+    return false unless sidekiq_pid
+
+    command = backend.capture(:ps, "-o", "command=", "-p", sidekiq_pid.to_s).strip
+    sidekiq_command_graceful?(command)
+  rescue SSHKit::Command::Failed
+    false
+  end
+
   def sidekiq_user(role = nil)
     if role.nil?
       fetch(:sidekiq_user)

data/lib/process_bot/process/handlers/sidekiq.rb

@@ -215,5 +215,15 @@ class ProcessBot::Process::Handlers::Sidekiq
     logger.logs "Wait for no jobs and Stop sidekiq"
     wait_for_no_jobs
     stop
+    wait_for_sidekiq_exit
+  end
+
+  def wait_for_sidekiq_exit
+    return unless current_pid
+
+    while process_running?(current_pid)
+      logger.logs "Waiting for Sidekiq PID #{current_pid} to stop"
+      sleep 1
+    end
   end
 end

data/lib/process_bot/process.rb

@@ -106,7 +106,8 @@ class ProcessBot::Process
 
   def send_control_command(command, **command_options)
     logger.logs "Sending #{command} command"
-    client.send_command(command: command, options: options.options.merge(command_options))
+    response = client.send_command(command: command, options: options.options.merge(command_options))
+    raise "No response from ProcessBot while sending #{command}" if response == :nil
   rescue Errno::ECONNREFUSED => e
     raise e unless options[:ignore_no_process_bot]
   end

data/lib/process_bot/version.rb

@@ -1,3 +1,3 @@
 module ProcessBot
-  VERSION = "0.1.15".freeze
+  VERSION = "0.1.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - kaspernj
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-05 00:00:00.000000000 Z
+date: 2026-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw