process_bot 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d79a43f8a6bdf408f637e66fff579115ab45f57f0c8c0314d98c1e84a8f4430
-  data.tar.gz: 716c9b8e69f54f1dc60a322d1ddad7f4336b464e338964ffa9f736d7cac11477
+  metadata.gz: e0a67de01a927a07fc17e06814e4752b2da954eca493143f7850b18e5a5b1aa9
+  data.tar.gz: f0fc56095299f93a43a45549c9399118d4ddf7e5e112ce701baac8b86e1b3756
 SHA512:
-  metadata.gz: 2739cfa0148b5085b45f0ca273d583f609413346e7d7ebed3693fb3715ebeb2ad4c14475b212c82a86e3bc1081585f2edc606c0d2f7ae2159a61722cfc1bc0c1
-  data.tar.gz: f59153145d7e36da05d9d9dc98d6e7d2f0a3b8f03fcfb51606b800453685f2fcb45e07eca46395cbdeac095f041749eb2064b9f98bc6dfe1c5e7d3fad5611e35
+  metadata.gz: 5cad374bb6dacaa0c2a87e7b1f0b1a7add878c8466a6d54de5836ed285f0ec7a4fde8f2a9dcac94ebc8432992dc92632953f587ab992883c2b3b5aadcb1497ee
+  data.tar.gz: d597eaac6ecbaa04c6926018f3bf3872438c7138f2a64bdb52691bf2b1183c0854f34a05f5681c576a648fd69c21c90ea6395bf30c7700868dd9fecfcb332158

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    process_bot (0.1.16)
+    process_bot (0.1.17)
       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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - kaspernj