Skip to content

Commit

Permalink
Merge pull request ManageIQ#19788 from agrare/remove_process_messages…
Browse files Browse the repository at this point in the history
…_from_server

Remove process_messages_from_server from MiqWorker
  • Loading branch information
Fryguy authored Jan 31, 2020
2 parents 3fb04b0 + 6bcc28c commit 9ff0a84
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions app/models/miq_worker/runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,6 @@ def heartbeat
_log.info("#{log_prefix} Synchronizing configuration complete...")
end

process_messages_from_server unless MiqEnvironment::Command.is_podified?

@last_hb = now
do_heartbeat_work
rescue SystemExit, SignalException
Expand All @@ -298,15 +296,6 @@ def heartbeat
do_exit("Error heartbeating because #{err.class.name}: #{err.message}\n#{err.backtrace.join('\n')}", 1)
end

def process_messages_from_server
worker_monitor_drb.register_worker(@worker.pid, @worker.class.name, @worker.queue_name)
worker_monitor_drb.worker_get_messages(@worker.pid).each do |msg, *args|
process_message(msg, *args)
end
rescue DRb::DRbError => err
do_exit("Error processing messages from MiqServer because #{err.class.name}: #{err.message}", 1)
end

def heartbeat_to_file(timeout = nil)
# Disable heartbeat check. Useful if a worker is running in isolation
# without the oversight of MiqServer::WorkerManagement
Expand Down

0 comments on commit 9ff0a84

Please sign in to comment.