GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 03:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add extra logging to auth server

Browse Source
This commit is contained in:
Jaime van Kessel 2021-07-23 10:40:30 +02:00
parent fc10c10906
commit b7ee3298c2
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/API/Account.py
View File

@ -109,7 +109,6 @@ class Account(QObject):
self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged) self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged)
self._authorization_service.loadAuthDataFromPreferences() self._authorization_service.loadAuthDataFromPreferences()
@pyqtProperty(int, notify=syncStateChanged) @pyqtProperty(int, notify=syncStateChanged)
def syncState(self): def syncState(self):
return self._sync_state return self._sync_state
@ -178,6 +177,7 @@ class Account(QObject):
if error_message: if error_message:
if self._error_message: if self._error_message:
self._error_message.hide() 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 = Message(error_message, title = i18n_catalog.i18nc("@info:title", "Login failed"))
self._error_message.show() self._error_message.show()
self._logged_in = False self._logged_in = False

7
cura/OAuth2/LocalAuthorizationServer.py
View File

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