process_bot 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d79a43f8a6bdf408f637e66fff579115ab45f57f0c8c0314d98c1e84a8f4430
-  data.tar.gz: 716c9b8e69f54f1dc60a322d1ddad7f4336b464e338964ffa9f736d7cac11477
+  metadata.gz: 00371cf3c9ed3fa904d5d3a8655be99178ce77a729ab2aad459572fc63bb4779
+  data.tar.gz: db9145067629c7872c810c03e1e97caa6c626837ec26d07fa6ceeebf1a623bdd
 SHA512:
-  metadata.gz: 2739cfa0148b5085b45f0ca273d583f609413346e7d7ebed3693fb3715ebeb2ad4c14475b212c82a86e3bc1081585f2edc606c0d2f7ae2159a61722cfc1bc0c1
-  data.tar.gz: f59153145d7e36da05d9d9dc98d6e7d2f0a3b8f03fcfb51606b800453685f2fcb45e07eca46395cbdeac095f041749eb2064b9f98bc6dfe1c5e7d3fad5611e35
+  metadata.gz: 89a0dde6cbadf510efb51b07f690ec90ca03af46ba06c9a1eca1f75a86e718bf23d263207aedd5a2763463e9470d9655d81487d5073f24a077edd1798acb2691
+  data.tar.gz: 27a95d5f8911f704c15faf58339c0173ca6cc01a3d7e8caa70743d6f3eadbbb9a44122b2ece7e74feaf4b7b6e7a03b1d7809e22cfa26efb4eb9967972f6846ff

data/CHANGELOG.md

@@ -1,4 +1,5 @@
 ## [Unreleased]
+- Stop accepting new control commands during shutdown so in-flight responses complete reliably.
 
 ## [0.1.0] - 2022-04-03
 

data/Gemfile.lock

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

data/README.md

@@ -44,7 +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:ensure_running` (starts missing processes, including replacements for graceful shutdowns)
 - `process_bot:sidekiq:restart`
 
 You can also skip waiting for graceful completion:

data/lib/process_bot/capistrano/sidekiq.rake

@@ -70,7 +70,7 @@ namespace :process_bot do
       end
     end
 
-    desc "Ensure the configured number of Sidekiq ProcessBots are running (excluding graceful shutdowns)"
+    desc "Ensure the configured number of Sidekiq ProcessBots are running (starts replacements for graceful shutdowns)"
     task :ensure_running do
       on roles fetch(:sidekiq_roles) do |role|
         git_plugin.switch_user(role) do
@@ -91,10 +91,12 @@ namespace :process_bot do
             git_plugin.process_bot_sidekiq_index(process_bot_data)
           end
 
-          puts "ProcessBot Sidekiq in graceful shutdown: #{graceful_indexes.join(", ")}" if graceful_indexes.any?
+          if graceful_indexes.any?
+            puts "ProcessBot Sidekiq in graceful shutdown: #{graceful_indexes.join(", ")}"
+            puts "Starting replacements for graceful shutdowns to reach #{desired_processes} running processes"
+          end
 
-          desired_indexes = (0...desired_processes).to_a
-          missing_indexes = desired_indexes - active_indexes - graceful_indexes
+          missing_indexes = git_plugin.missing_sidekiq_indexes(desired_processes, active_indexes)
           missing_count = desired_processes - active_indexes.count
 
           if missing_count.negative?
@@ -107,14 +109,9 @@ namespace :process_bot do
               puts "Starting Sidekiq with ProcessBot #{idx} (missing)"
               git_plugin.start_sidekiq(idx)
             end
-          else
+          elsif missing_count.zero?
             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

data/lib/process_bot/capistrano/sidekiq_helpers.rb

@@ -118,6 +118,12 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     false
   end
 
+  def missing_sidekiq_indexes(desired_processes, active_indexes)
+    desired = desired_processes.to_i
+    desired_indexes = (0...desired).to_a
+    desired_indexes - active_indexes
+  end
+
   def sidekiq_user(role = nil)
     if role.nil?
       fetch(:sidekiq_user)

data/lib/process_bot/control_socket.rb

@@ -79,13 +79,20 @@ class ProcessBot::ControlSocket
 
       if command_type == "graceful" || command_type == "graceful_no_wait" || command_type == "stop"
         begin
+          unless process.accept_control_commands?
+            client.puts(JSON.generate(type: "error", message: "ProcessBot is shutting down", backtrace: Thread.current.backtrace))
+            break
+          end
+
           command_options = if command["options"]
             symbolize_keys(command.fetch("options"))
           else
             {}
           end
 
-          run_command(command_type, command_options, client)
+          process.with_control_command do
+            run_command(command_type, command_options, client)
+          end
         rescue => e # rubocop:disable Style/RescueStandardError
           logger.error e.message
           logger.error e.backtrace

data/lib/process_bot/process.rb

@@ -1,5 +1,6 @@
 require "forwardable"
 require "json"
+require "monitor"
 require "string-cases"
 
 class ProcessBot::Process
@@ -12,11 +13,14 @@ class ProcessBot::Process
   autoload :Handlers, "#{__dir__}/process/handlers"
   autoload :Runner, "#{__dir__}/process/runner"
 
-  attr_reader :current_pid, :current_process_title, :options, :port, :stopped
+  attr_reader :control_command_monitor, :current_pid, :current_process_title, :options, :port, :stopped
 
   def initialize(options)
     @options = options
     @stopped = false
+    @accept_control_commands = true
+    @control_command_monitor = Monitor.new
+    @control_commands_in_flight = 0
 
     options.events.connect(:on_process_started, &method(:on_process_started)) # rubocop:disable Performance/MethodObjectAsBlock
     options.events.connect(:on_socket_opened, &method(:on_socket_opened)) # rubocop:disable Performance/MethodObjectAsBlock
@@ -86,6 +90,8 @@ class ProcessBot::Process
       run
 
       if stopped
+        stop_accepting_control_commands
+        wait_for_control_commands
         break
       else
         logger.logs "Process stopped - starting again after 1 sec"
@@ -127,4 +133,35 @@ class ProcessBot::Process
     @current_process_title = "ProcessBot #{JSON.generate(process_args)}"
     Process.setproctitle(current_process_title)
   end
+
+  def with_control_command
+    control_command_monitor.synchronize do
+      @control_commands_in_flight += 1
+    end
+
+    yield
+  ensure
+    control_command_monitor.synchronize do
+      @control_commands_in_flight -= 1
+    end
+  end
+
+  def accept_control_commands?
+    @accept_control_commands
+  end
+
+  def stop_accepting_control_commands
+    @accept_control_commands = false
+    @control_socket&.stop
+  end
+
+  def wait_for_control_commands
+    sleep 0.1 while control_commands_in_flight.positive?
+  end
+
+  def control_commands_in_flight
+    control_command_monitor.synchronize do
+      @control_commands_in_flight
+    end
+  end
 end

data/lib/process_bot/version.rb

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

metadata

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