Commit 9fa9e926 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Disabled SystemExit in process_controller.stop().

parent fbab3ade
...@@ -511,7 +511,8 @@ class process_controller(object): ...@@ -511,7 +511,8 @@ class process_controller(object):
def stop(self, signum, frame): def stop(self, signum, frame):
"""Interrupt the running process controller gracefully.""" """Interrupt the running process controller gracefully."""
self.logger.warning('Process controller stopped.') self.logger.info('Process controller stopped via %s.'
% ('KeyboardInterrupt' if signum == 2 else 'SIGTERM command'))
self.config.status = 'canceled' self.config.status = 'canceled'
self.update_DB_job_record() self.update_DB_job_record()
...@@ -519,8 +520,6 @@ class process_controller(object): ...@@ -519,8 +520,6 @@ class process_controller(object):
if signum == 2: if signum == 2:
raise KeyboardInterrupt('Received a KeyboardInterrupt.') # terminate execution and show traceback raise KeyboardInterrupt('Received a KeyboardInterrupt.') # terminate execution and show traceback
elif signum == 15:
raise SystemExit('Received a SIGTERM command.')
def shutdown(self): def shutdown(self):
"""Shutdown the process controller instance (loggers, remove temporary directories, ...).""" """Shutdown the process controller instance (loggers, remove temporary directories, ...)."""
......
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