mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Fix PulsarMQRunner shutdown.
This commit is contained in:
committed by
Nate Coraor
parent
b0f0fdc171
commit
ca55cab671
@@ -752,6 +752,8 @@ class PulsarMQJobRunner(PulsarJobRunner):
|
||||
def _monitor(self):
|
||||
# This is a message queue driven runner, don't monitor
|
||||
# just setup required callback.
|
||||
self._init_noop_monitor()
|
||||
|
||||
self.client_manager.ensure_has_status_update_callback(self.__async_update)
|
||||
self.client_manager.ensure_has_ack_consumers()
|
||||
|
||||
|
||||
@@ -30,6 +30,10 @@ class Monitors(object):
|
||||
self._start = start
|
||||
register_postfork_function(self.start_monitoring)
|
||||
|
||||
def _init_noop_monitor(self):
|
||||
self.sleeper = None
|
||||
self.monitor_join = False
|
||||
|
||||
def start_monitoring(self):
|
||||
if self._start:
|
||||
self.monitor_thread.start()
|
||||
@@ -42,7 +46,8 @@ class Monitors(object):
|
||||
|
||||
def shutdown_monitor(self):
|
||||
self.stop_monitoring()
|
||||
self.sleeper.wake()
|
||||
if self.sleeper is not None:
|
||||
self.sleeper.wake()
|
||||
if self.monitor_join:
|
||||
log.debug("Joining monitor thread")
|
||||
self.monitor_thread.join(self.monitor_join_sleep)
|
||||
|
||||
Reference in New Issue
Block a user