scheduler: fix exceptions and exit codes

cylc · Jun 4, 2020 · aaba326 · aaba326
1 parent 671930d
commit aaba326
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cylc/flow/scheduler.py b/cylc/flow/scheduler.py
@@ -558,6 +558,7 @@ async def start(self):
 
         except SchedulerError as exc:
             await self.shutdown(exc)
+            raise exc from None
 
         except Exception as exc:
             try:

diff --git a/cylc/flow/scheduler_cli.py b/cylc/flow/scheduler_cli.py
@@ -240,7 +240,7 @@ def get_option_parser(is_restart):
     return parser
 
 
-# options we cannot simply extract from the parser
+# options we cannot simply extract from the parser
 DEFAULT_OPTS = {
     'debug': False,
     'verbose': False,
@@ -381,9 +381,10 @@ def scheduler_cli(parser, options, args, is_restart=False):
             # In case of exceptions in the shutdown method itself.
             LOG.exception(exc2)
             raise exc2 from None
+        sys.exit(1)
     except Exception:
         # suppress the exception to prevent it appearing in the log
-        pass
+        sys.exit(1)
     finally:
         LOG.info("DONE")
         _close_logs()