changeset 3490:509f7a1c67dc

frontends: use new EXIT_BACKEND_NOT_FOUND exit code: - new EXIT_BACKEND_NOT_FOUND (5) is used when frontend can't find backend with the bridge. It differs from EXIT_BRIDGE_ERROR (3) which is used when something went wrong when connecting to backend. - use this exit code in quick app and in jp
author Goffi <goffi@goffi.org>
date Tue, 23 Mar 2021 21:21:00 +0100 (2021-03-23)
parents d71a163c0861
children 2bd75fc2555d
files sat/core/constants.py sat_frontends/jp/base.py sat_frontends/quick_frontend/quick_app.py
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/sat/core/constants.py	Sun Mar 21 22:00:55 2021 +0100
+++ b/sat/core/constants.py	Tue Mar 23 21:21:00 2021 +0100
@@ -381,6 +381,7 @@
     EXIT_BAD_ARG = 2  # arguments given by user are bad
     EXIT_BRIDGE_ERROR = 3  # can't connect to bridge
     EXIT_BRIDGE_ERRBACK = 4  # something went wrong when calling a bridge method
+    EXIT_BACKEND_NOT_FOUND = 5  # can't find backend with this bride
     EXIT_NOT_FOUND = 16  # an item required by a command was not found
     EXIT_DATA_ERROR = 17  # data needed for a command is invalid
     EXIT_MISSING_FEATURE = 18  # a needed plugin or feature is not available
--- a/sat_frontends/jp/base.py	Sun Mar 21 22:00:55 2021 +0100
+++ b/sat_frontends/jp/base.py	Tue Mar 23 21:21:00 2021 +0100
@@ -649,11 +649,13 @@
         except Exception as e:
             if isinstance(e, exceptions.BridgeExceptionNoService):
                 print((_("Can't connect to SàT backend, are you sure it's launched ?")))
+                self.quit(C.EXIT_BACKEND_NOT_FOUND, raise_exc=False)
             elif isinstance(e, exceptions.BridgeInitError):
                 print((_("Can't init bridge")))
+                self.quit(C.EXIT_BRIDGE_ERROR, raise_exc=False)
             else:
                 print((_(f"Error while initialising bridge: {e}")))
-            self.quit(C.EXIT_BRIDGE_ERROR, raise_exc=False)
+                self.quit(C.EXIT_BRIDGE_ERROR, raise_exc=False)
             return
         self.version = await self.bridge.getVersion()
         self._bridgeConnected()
--- a/sat_frontends/quick_frontend/quick_app.py	Sun Mar 21 22:00:55 2021 +0100
+++ b/sat_frontends/quick_frontend/quick_app.py	Tue Mar 23 21:21:00 2021 +0100
@@ -368,10 +368,10 @@
     def _bridgeEb(self, failure):
         if isinstance(failure, exceptions.BridgeExceptionNoService):
             print((_("Can't connect to SàT backend, are you sure it's launched ?")))
-            sys.exit(1)
+            sys.exit(C.EXIT_BACKEND_NOT_FOUND)
         elif isinstance(failure, exceptions.BridgeInitError):
             print((_("Can't init bridge")))
-            sys.exit(1)
+            sys.exit(C.EXIT_BRIDGE_ERROR)
         else:
             print((_("Error while initialising bridge: {}".format(failure))))