From b0b1ed589bc167800345b7d1c7658e3c9cde30bd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 10 Nov 2021 10:07:37 +0000 Subject: [PATCH] CAPI: Don't blindly dump r(equest.Response) on failure Also explicitly logs the exception now. --- companion.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/companion.py b/companion.py index 2682fd8a..a518fac1 100644 --- a/companion.py +++ b/companion.py @@ -343,6 +343,7 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: + r: Optional[requests.Response] = None r = self.requests_session.post( FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=data, @@ -360,9 +361,10 @@ class Auth(object): logger.error(f"Frontier CAPI Auth: Can't refresh token for \"{self.cmdr}\"") self.dump(r) - except (ValueError, requests.RequestException, ): - logger.exception(f"Frontier CAPI Auth: Can't refresh token for \"{self.cmdr}\"") - self.dump(r) + except (ValueError, requests.RequestException, ) as e: + logger.exception(f"Frontier CAPI Auth: Can't refresh token for \"{self.cmdr}\"\n{e!r}") + if r is not None: + self.dump(r) else: logger.error(f"Frontier CAPI Auth: No token for \"{self.cmdr}\"")