Browse Source

Add extra logging to auth server

Jaime van Kessel 3 years ago
parent
commit
b7ee3298c2
2 changed files with 6 additions and 3 deletions
  1. 1 1
      cura/API/Account.py
  2. 5 2
      cura/OAuth2/LocalAuthorizationServer.py

+ 1 - 1
cura/API/Account.py

@@ -109,7 +109,6 @@ class Account(QObject):
         self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged)
         self._authorization_service.loadAuthDataFromPreferences()
 
-
     @pyqtProperty(int, notify=syncStateChanged)
     def syncState(self):
         return self._sync_state
@@ -178,6 +177,7 @@ class Account(QObject):
         if error_message:
             if self._error_message:
                 self._error_message.hide()
+            Logger.log("w", "Failed to login: %s", error_message)
             self._error_message = Message(error_message, title = i18n_catalog.i18nc("@info:title", "Login failed"))
             self._error_message.show()
             self._logged_in = False

+ 5 - 2
cura/OAuth2/LocalAuthorizationServer.py

@@ -54,6 +54,7 @@ class LocalAuthorizationServer:
         if self._web_server:
             # If the server is already running (because of a previously aborted auth flow), we don't have to start it.
             # We still inject the new verification code though.
+            Logger.log("d", "Auth web server was already running. Updating the verification code")
             self._web_server.setVerificationCode(verification_code)
             return
 
@@ -85,6 +86,7 @@ class LocalAuthorizationServer:
             except OSError:
                 # OS error can happen if the socket was already closed. We really don't care about that case.
                 pass
+        Logger.log("d", "Local oauth2 web server was shut down")
         self._web_server = None
         self._web_server_thread = None
 
@@ -96,12 +98,13 @@ class LocalAuthorizationServer:
 
         :return: None
         """
+        Logger.log("d", "Local web server for authorization has started")
         if self._web_server:
             if sys.platform == "win32":
                 try:
                     self._web_server.serve_forever()
-                except OSError as e:
-                    Logger.warning(str(e))
+                except OSError:
+                    Logger.logException("w", "An exception happened while serving the auth server")
             else:
                 # Leave the default behavior in non-windows platforms
                 self._web_server.serve_forever()