From 0cace3cec3652f419aa781aeb14e77670bf4c77c Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Sat, 19 Feb 2022 23:29:58 +0000 Subject: [PATCH] improved exit code reporting Former-commit-id: f36f45bc6a2773b8a821d0e046ce1b47fc4ced0f --- src/superscript.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/superscript.py b/src/superscript.py index 59e01d0..fa032aa 100644 --- a/src/superscript.py +++ b/src/superscript.py @@ -168,7 +168,6 @@ def main(logger, verbose, profile, debug, socket_send = None): client.close() warnings.filterwarnings("ignore") - exit_code = 0 logger.splash(__version__) @@ -229,12 +228,10 @@ def main(logger, verbose, profile, debug, socket_send = None): socket_send("finished all tasks in " + str(time.time() - loop_start) + " seconds, looping") if profile: - exit_code = 0 - break + return 0 if debug: - exit_code = 0 - break + return 0 event_delay = config["variable"]["event-delay"] if event_delay: @@ -258,7 +255,7 @@ def main(logger, verbose, profile, debug, socket_send = None): close_all() logger.info("detected KeyboardInterrupt, exiting") socket_send("detected KeyboardInterrupt, exiting") - break + return 0 except ConfigurationError as e: str_e = "".join(traceback.format_exception(e)) @@ -266,9 +263,8 @@ def main(logger, verbose, profile, debug, socket_send = None): logger.error(str_e) socket_send("encountered a configuration error: " + str(e)) socket_send(str_e) - exit_code = 1 close_all() - break + return 1 except Exception as e: str_e = "".join(traceback.format_exception(e)) @@ -276,11 +272,8 @@ def main(logger, verbose, profile, debug, socket_send = None): logger.error(str_e) socket_send("encountered an exception while running") socket_send(str_e) - exit_code = 1 close_all() - break - - return exit_code + return 1 def start(pid_path, verbose, profile, debug):