process_bot 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b1576890e101bf63b28b5b1d15576fc0003cdd51c73ca753032b27ec48ad32
-  data.tar.gz: 3175432c97bddeaa1a8f7031a6912888aef18cf1dd961eaa07402a7dde4837b6
+  metadata.gz: a955f30c30ca3ec6ae94f3684d492c06b7a0d40042c5de324ced6681720fbb4b
+  data.tar.gz: eaae86a1fead6761d82a2f8bd82fa73772351c2e7c307ac3b0e681e435c798bb
 SHA512:
-  metadata.gz: 36ec2ccd36275a523b10f0dfead5c6ab3124602b7e489265e0c9536d46d737a72d08e9c32db63703271e58f058894ea6370ffb441a2b9a4783100836e8458453
-  data.tar.gz: d659cacc4d5b1473e076416cf4e7836008f196a6a126691dea58ccb4ee6ec77a42223c0aa60a56d54ad6782dcd0362756cdbc4dad34ed9829d1dbd8c10f9e488
+  metadata.gz: 9ed08da8b21e32e38d93fb65bff64ec3ef90678ae210b17cc11640829e24c29ef132955ca7fe102444f4f470c2468ce03d78a2b68b3b468a066e84f9126a264a
+  data.tar.gz: 86ba81368cbddf10daf0b8ec9f189c03214e6ea15fb03be45a1e68aaf774f9043e48c608ce64e7933a3f04fc19a6a013c16f03b93773eb1d5a6e03daad52758b

data/Gemfile.lock

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

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

@@ -25,6 +25,41 @@ class ProcessBot::Process::Handlers::Sidekiq
     !value || value == "false"
   end
 
+  def process_running?(pid)
+    return false unless pid
+
+    Process.getpgid(pid)
+    true
+  rescue Errno::ESRCH
+    false
+  end
+
+  def related_sidekiq_pid
+    related_sidekiq_processes = process.runner.related_sidekiq_processes
+    if related_sidekiq_processes.empty?
+      logger.logs "No related Sidekiq processes found while refreshing PID"
+      return nil
+    end
+
+    related_sidekiq_processes.first.pid
+  end
+
+  def update_current_pid(new_pid)
+    logger.logs "Refreshing Sidekiq PID from #{current_pid || 'nil'} to #{new_pid}"
+    options.events.call(:on_process_started, pid: new_pid)
+    new_pid
+  end
+
+  def refresh_current_pid(only_if_present: false)
+    return nil if only_if_present && !current_pid
+    return current_pid if process_running?(current_pid)
+
+    new_pid = related_sidekiq_pid
+    return nil unless new_pid
+
+    update_current_pid(new_pid)
+  end
+
   def fetch(*args, **opts)
     options.fetch(*args, **opts)
   end
@@ -43,6 +78,61 @@ class ProcessBot::Process::Handlers::Sidekiq
     options.set(*args, **opts)
   end
 
+  def send_tstp_or_return
+    Process.kill("TSTP", current_pid)
+    true
+  rescue Errno::ESRCH
+    logger.logs "Sidekiq PID #{current_pid} disappeared before TSTP"
+    false
+  end
+
+  def ensure_current_pid?
+    unless current_pid
+      warn "Sidekiq not running with a PID"
+      return false
+    end
+
+    unless refresh_current_pid
+      logger.logs "Sidekiq PID not running and no replacement found - nothing to stop"
+      return false
+    end
+
+    true
+  end
+
+  def terminate_pid(pid)
+    Process.kill("TERM", pid)
+  rescue Errno::ESRCH
+    logger.logs "Sidekiq PID #{pid} is not running - nothing to stop"
+  end
+
+  def terminate_related_sidekiq_processes
+    related_sidekiq_processes = process.runner.related_sidekiq_processes
+
+    if related_sidekiq_processes.empty?
+      logger.error "#{handler_name} didn't have any processes running"
+      return
+    end
+
+    related_sidekiq_processes.each do |related_sidekiq_process|
+      terminate_pid(related_sidekiq_process.pid)
+    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 = []
 
@@ -71,39 +161,20 @@ class ProcessBot::Process::Handlers::Sidekiq
     wait_for_gracefully_stopped = args.fetch(:wait_for_gracefully_stopped, true)
     process.set_stopped
 
-    unless current_pid
-      warn "Sidekiq not running with a PID"
-      return
-    end
-
-    Process.kill("TSTP", current_pid)
+    return unless ensure_current_pid?
 
-    if false_value?(wait_for_gracefully_stopped)
-      logger.logs "Dont wait for gracefully stopped - doing that in fork..."
+    return unless send_tstp_or_return
 
-      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
+    handle_graceful_wait(wait_for_gracefully_stopped)
   end
 
   def stop(**_args)
+    refresh_current_pid(only_if_present: true)
+
     if current_pid
-      Process.kill("TERM", current_pid)
+      terminate_pid(current_pid)
     else
-      related_sidekiq_processes = process.runner.related_sidekiq_processes
-
-      if related_sidekiq_processes.empty?
-        logger.error "#{handler_name} didn't have any processes running"
-      else
-        related_sidekiq_processes.each do |related_sidekiq_process|
-          Process.kill("TERM", related_sidekiq_process.pid)
-        end
-      end
+      terminate_related_sidekiq_processes
     end
   end
 
@@ -111,7 +182,10 @@ class ProcessBot::Process::Handlers::Sidekiq
     loop do
       found_process = false
 
-      raise "No current PID for Sidekiq" unless current_pid
+      unless refresh_current_pid
+        logger.logs "Sidekiq PID not running while waiting for jobs"
+        return
+      end
 
       Knj::Unix_proc.list("grep" => current_pid) do |process|
         process_command = process.data.fetch("cmd")
@@ -130,7 +204,10 @@ class ProcessBot::Process::Handlers::Sidekiq
         return if running_jobs.zero? # rubocop:disable Lint/NonLocalExitFromIterator
       end
 
-      raise "Couldn't find running process with PID #{current_pid}" unless found_process
+      unless found_process
+        logger.logs "Couldn't find running process with PID #{current_pid}"
+        return
+      end
 
       sleep 1
     end

data/lib/process_bot/version.rb

@@ -1,3 +1,3 @@
 module ProcessBot
-  VERSION = "0.1.9".freeze
+  VERSION = "0.1.10".freeze
 end

metadata

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