A platform for community discussion. Free, open, simple.
DEV: Improve sidekiq parent monitoring (#39230)
Jarek Radosz39d09cf59b8e
diff --git a/lib/demon/base.rb b/lib/demon/base.rbindex 993da1716f3..f61d9e7477f 100644--- a/lib/demon/base.rb+++ b/lib/demon/base.rb@@ -225,21 +225,33 @@ class Demon::Basedef monitor_parentThread.new do- while true- begin- unless alive?(@parent_pid)- Process.kill "TERM", Process.pid- sleep 10- Process.kill "KILL", Process.pid- end- rescue => e- log("URGENT monitoring thread had an exception #{e}", level: :error)- end+ loop do+ monitor_parent_ticksleep 1endendend+ def monitor_parent_tick+ if !alive?(@parent_pid)+ Process.kill "TERM", Process.pid+ sleep 10+ Process.kill "KILL", Process.pid+ end+ rescue Exception => e+ log_error(e)+ end++ def log_error(e)+ log("URGENT monitoring thread had an exception #{e.class}: #{e.message}", level: :error)+ rescue Exception+ # Fall back to STDERR if the logger is broken+ begin+ $stderr.puts("[#{self.class}##{Process.pid}] monitor-parent: #{e.class}: #{e.message}")+ rescue StandardError+ end+ end+def suppress_stdouttrueend