Commit eedd5b6b authored by Flavio TARSETTI's avatar Flavio TARSETTI

Merge branch 'improve_message_handler_shutdown' into 'master'

Improve handling of message handler shutdown in local executor

See merge request !109
parents 555309c5 7d29936b
Pipeline #36734 passed with stages
in 23 minutes and 30 seconds
......@@ -200,7 +200,12 @@ class LocalExecutor(BaseExecutor):
for handler in [self.message_handler, self.loop_message_handler]:
if handler:
handler.kill()
handler.join()
try:
handler.join()
except RuntimeError:
# The handler was not started
pass
handler.destroy()
for socket in [self.executor_socket, self.loop_socket]:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment