From 6aa95f4fd6b434dfa80d0d7e32c45483a45a403f Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Jul 03 2024 15:32:03 +0000 Subject: [PATCH 1/2] exit with an error in kojira on auth failures --- diff --git a/util/kojira b/util/kojira index 5e98f39..eda0949 100755 --- a/util/kojira +++ b/util/kojira @@ -703,6 +703,7 @@ def main(options, session): regen_thread = start_regen_loop(session, repomgr) rmtree_thread = start_rmtree_loop(session, repomgr) logger.info("Entering main loop") + exit_code = 0 while True: try: repomgr.updateRepos() @@ -725,9 +726,11 @@ def main(options, session): break except koji.AuthExpired: logger.warning("Session expired") + exit_code = 1 break except koji.AuthError: logger.warning("Authentication error") + exit_code = 1 break except SystemExit: logger.warning("Shutting down") @@ -745,6 +748,7 @@ def main(options, session): repomgr.killChildren() finally: session.logout() + sys.exit(exit_code) def get_options(): From 11783467fcb7508645b50fef406034bdaaa5a2b0 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Jul 03 2024 15:45:31 +0000 Subject: [PATCH 2/2] exit codes for kojivmd --- diff --git a/vm/kojivmd b/vm/kojivmd index c19de1f..45eab81 100755 --- a/vm/kojivmd +++ b/vm/kojivmd @@ -252,6 +252,7 @@ def main(options, session): tm.restart_pending = True signal.signal(signal.SIGTERM, shutdown) signal.signal(signal.SIGUSR1, restart) + exit_code = 0 taken = False tm.cleanupAllVMs() while True: @@ -270,6 +271,11 @@ def main(options, session): raise except koji.AuthExpired: logger.error('Session expired') + exit_code = 1 + break + except koji.AuthError: + logger.error('Authentication error') + exit_code = 1 break except Exception: # XXX - this is a little extreme @@ -287,7 +293,7 @@ def main(options, session): logger.warning("Shutting down, please wait...") tm.shutdown() session.logout() - sys.exit(0) + sys.exit(exit_code) ####################