process_bot 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7faeef8de7bcedd0fb66cc0fcf161de87d94ee3d4e9cceda30086afc12fc09fb
-  data.tar.gz: 79370a6f54b1f58ee5df361bdf99637e206310d126bbd9da2a8bbeae509561bb
+  metadata.gz: 7d79a43f8a6bdf408f637e66fff579115ab45f57f0c8c0314d98c1e84a8f4430
+  data.tar.gz: 716c9b8e69f54f1dc60a322d1ddad7f4336b464e338964ffa9f736d7cac11477
 SHA512:
-  metadata.gz: 01ab0ae7b02f813fd00313750924b3162167506cc546b49c6d03dc38fd702b3a5d1082aa45cdc7267800575acdb517381b5243937214319b630ee99d765ee6a2
-  data.tar.gz: 0df83d2af7a0180834e6bfb50d3fcd6e9834abb3a60d23a78cd5d80bc5a6c8441ad0f242da3cccb4b8eb4e49fa9ce12d041b87bd69be7d1e729e151f349d1937
+  metadata.gz: 2739cfa0148b5085b45f0ca273d583f609413346e7d7ebed3693fb3715ebeb2ad4c14475b212c82a86e3bc1081585f2edc606c0d2f7ae2159a61722cfc1bc0c1
+  data.tar.gz: f59153145d7e36da05d9d9dc98d6e7d2f0a3b8f03fcfb51606b800453685f2fcb45e07eca46395cbdeac095f041749eb2064b9f98bc6dfe1c5e7d3fad5611e35

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    process_bot (0.1.14)
+    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:
@@ -88,7 +89,7 @@ set :process_bot_log, false
 When running ProcessBot directly, you can control graceful waiting and log file output:
 
 ```bash
-bundle exec process_bot --command graceful --wait-for-gracefully-stopped false
+bundle exec process_bot --command graceful_no_wait
 bundle exec process_bot --command start --log-file-path /var/log/process_bot.log
 ```
 

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

@@ -36,14 +36,11 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     raise "No port in process bot data? #{process_bot_data}" unless process_bot_data["port"]
 
     mode = "exec"
-    wait_for_gracefully_stopped = process_bot_wait_setting(command)
 
     if mode == "runner"
       args = {command: command, port: process_bot_data.fetch("port")}
       args["log"] = fetch(:process_bot_log) unless fetch(:process_bot_log).nil?
 
-      args["wait_for_gracefully_stopped"] = wait_for_gracefully_stopped unless wait_for_gracefully_stopped.nil?
-
       escaped_args = JSON.generate(args).gsub("\"", "\\\"")
       rails_runner_command = "require 'process_bot'; ProcessBot::Process.new(ProcessBot::Options.from_args(#{escaped_args})).execute!"
 
@@ -61,7 +58,6 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
         backend_command << "#{key} #{value}"
       end
 
-      backend_command << " --wait-for-gracefully-stopped #{wait_for_gracefully_stopped}" unless wait_for_gracefully_stopped.nil?
     else
       raise "Unknown mode: #{mode}"
     end
@@ -69,13 +65,6 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     backend.execute backend_command
   end
 
-  def process_bot_wait_setting(command)
-    return true if command == :graceful
-    return false if command == :graceful_no_wait
-
-    nil
-  end
-
   def running_process_bot_processes
     sidekiq_app_name = fetch(:sidekiq_app_name, fetch(:application))
     raise "No :sidekiq_app_name was set" unless sidekiq_app_name
@@ -104,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/control_socket.rb

@@ -1,4 +1,6 @@
 require "socket"
+require "json"
+require "knjrbfw"
 
 class ProcessBot::ControlSocket
   attr_reader :options, :port, :process, :server
@@ -21,15 +23,25 @@ class ProcessBot::ControlSocket
   end
 
   def start_tcp_server
-    tries ||= 0
-    tries += 1
-    @server = actually_start_tcp_server("localhost", @port)
-  rescue Errno::EADDRINUSE, Errno::EADDRNOTAVAIL => e
-    if tries <= 100
-      @port += 1
-      retry
-    else
-      raise e
+    used_ports = used_process_bot_ports
+    attempts = 0
+
+    loop do
+      if used_ports.include?(@port)
+        @port += 1
+        next
+      end
+
+      attempts += 1
+      @server = actually_start_tcp_server("localhost", @port)
+      break
+    rescue Errno::EADDRINUSE, Errno::EADDRNOTAVAIL => e
+      if attempts <= 100
+        @port += 1
+        next
+      else
+        raise e
+      end
     end
   end
 
@@ -100,18 +112,30 @@ class ProcessBot::ControlSocket
   end
 
   def run_command(command_type, command_options, client)
-    command_type, command_options = normalize_command(command_type, command_options)
     logger.logs "Command #{command_type} with options #{command_options}"
 
     process.__send__(command_type, **command_options)
     client.puts(JSON.generate(type: "success"))
   end
 
-  def normalize_command(command_type, command_options)
-    return [command_type, command_options] unless command_type == "graceful_no_wait"
+  def used_process_bot_ports
+    ports = []
+
+    Knj::Unix_proc.list("grep" => "ProcessBot") do |process|
+      process_command = process.data.fetch("cmd")
+      match = process_command.match(/ProcessBot (\{.+\})/)
+      next unless match
+
+      begin
+        process_data = JSON.parse(match[1])
+      rescue JSON::ParserError
+        next
+      end
+
+      port = process_data["port"]
+      ports << port.to_i if port
+    end
 
-    command_type = "graceful"
-    command_options[:wait_for_gracefully_stopped] = false
-    [command_type, command_options]
+    ports.uniq
   end
 end

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

@@ -21,10 +21,6 @@ class ProcessBot::Process::Handlers::Sidekiq
     Process.detach(pid) if pid
   end
 
-  def false_value?(value)
-    !value || value == "false"
-  end
-
   def process_running?(pid)
     return false unless pid
 
@@ -121,20 +117,6 @@ class ProcessBot::Process::Handlers::Sidekiq
     end
   end
 
-  def handle_graceful_wait(wait_for_gracefully_stopped)
-    if false_value?(wait_for_gracefully_stopped)
-      logger.logs "Dont wait for gracefully stopped - doing that in fork..."
-
-      daemonize do
-        wait_for_no_jobs_and_stop_sidekiq
-        exit
-      end
-    else
-      logger.logs "Wait for gracefully stopped..."
-      wait_for_no_jobs_and_stop_sidekiq
-    end
-  end
-
   def start_command # rubocop:disable Metrics/AbcSize
     args = []
 
@@ -159,15 +141,29 @@ class ProcessBot::Process::Handlers::Sidekiq
     command
   end
 
-  def graceful(**args)
-    wait_for_gracefully_stopped = args.fetch(:wait_for_gracefully_stopped, true)
+  def graceful(**_args)
+    process.set_stopped
+
+    return unless ensure_current_pid?
+
+    return unless send_tstp_or_return
+
+    logger.logs "Wait for gracefully stopped..."
+    wait_for_no_jobs_and_stop_sidekiq
+  end
+
+  def graceful_no_wait(**_args)
     process.set_stopped
 
     return unless ensure_current_pid?
 
     return unless send_tstp_or_return
 
-    handle_graceful_wait(wait_for_gracefully_stopped)
+    logger.logs "Dont wait for gracefully stopped - doing that in fork..."
+    daemonize do
+      wait_for_no_jobs_and_stop_sidekiq
+      exit
+    end
   end
 
   def stop(**_args)
@@ -219,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

@@ -6,6 +6,7 @@ class ProcessBot::Process
   extend Forwardable
 
   def_delegator :handler_instance, :graceful
+  def_delegator :handler_instance, :graceful_no_wait
   def_delegator :handler_instance, :stop
 
   autoload :Handlers, "#{__dir__}/process/handlers"
@@ -29,10 +30,8 @@ class ProcessBot::Process
     if command == "start"
       logger.logs "Starting process"
       start
-    elsif command == "graceful" || command == "stop"
+    elsif command == "graceful" || command == "graceful_no_wait" || command == "stop"
       send_control_command(command)
-    elsif command == "graceful_no_wait"
-      send_control_command(command, wait_for_gracefully_stopped: false)
     else
       raise "Unknown command: #{command}"
     end
@@ -107,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.14".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.14
+  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