A platform for community discussion. Free, open, simple.
FIX: Keep checking other daemons after a heartbeat failure (#44810)
Alan Guo Xiang Tanbf50fe85bc1f
diff --git a/config/pitchfork.conf.rb b/config/pitchfork.conf.rbindex 7890dce6988..5fb9deaea8b 100644--- a/config/pitchfork.conf.rb+++ b/config/pitchfork.conf.rb@@ -142,24 +142,31 @@ before_service_worker_ready do |server, service_worker|STDOUT.puts "Pitchfork ready on http://localhost:#{ENV["UNICORN_PORT"] || 3000} (#{parts.join(", ")})"end+ check_demon =+ lambda do |&check|+ check.call+ rescue => e+ Rails.logger.warn("Error in demon processes heartbeat check: #{e}\n#{e.backtrace.join("\n")}")+ end+Thread.new dowhile true- begin- sleep 60+ sleep 60- if sidekiqs > 0+ if sidekiqs > 0+ check_demon.call doDemon::Sidekiq.ensure_runningDemon::Sidekiq.heartbeat_checkDemon::Sidekiq.rss_memory_checkend+ end- Demon::DiscourseVips.ensure_running if GlobalSetting.enable_vips_image_processing+ if GlobalSetting.enable_vips_image_processing+ check_demon.call { Demon::DiscourseVips.ensure_running }+ end- DiscoursePluginRegistry.demon_processes.each { |demon_class| demon_class.ensure_running }- rescue => e- Rails.logger.warn(- "Error in demon processes heartbeat check: #{e}\n#{e.backtrace.join("\n")}",- )+ DiscoursePluginRegistry.demon_processes.each do |demon_class|+ check_demon.call { demon_class.ensure_running }endendend