From 574e91bb38d7b8e9480eaf4e92f592f5e2341112 Mon Sep 17 00:00:00 2001 From: Robert Resch Date: Sat, 20 Aug 2022 13:58:20 +0200 Subject: [PATCH] fix "UnboundLocalError" --- bumper/web/middlewares.py | 14 ++++++-------- bumper/web/server.py | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/bumper/web/middlewares.py b/bumper/web/middlewares.py index f5e3b00..3731447 100644 --- a/bumper/web/middlewares.py +++ b/bumper/web/middlewares.py @@ -18,13 +18,12 @@ class CustomEncoder(json.JSONEncoder): return list(obj) return json.JSONEncoder.default(self, obj) + _EXCLUDE_FROM_LOGGING = ["base", "remove-bot", "remove-client", "restart-service"] @web.middleware -async def log_all_requests( - request: Request, handler: Handler -) -> StreamResponse: +async def log_all_requests(request: Request, handler: Handler) -> StreamResponse: if request.match_info.route.name not in _EXCLUDE_FROM_LOGGING: to_log = { "request": { @@ -55,10 +54,7 @@ async def log_all_requests( "status": f"{response.status}", } - if ( - isinstance(response, Response) - and response.body - ): + if isinstance(response, Response) and response.body: if response.content_type == "application/json": to_log["response"]["body"] = json.loads(response.text) elif response.content_type.startswith("text"): @@ -71,7 +67,9 @@ async def log_all_requests( raise except Exception: - _LOGGER.exception("An exception occurred in the logging middleware.", exc_info=True) + _LOGGER.exception( + "An exception occurred in the logging middleware.", exc_info=True + ) raise finally: diff --git a/bumper/web/server.py b/bumper/web/server.py index 9ba1f9b..d1c633c 100644 --- a/bumper/web/server.py +++ b/bumper/web/server.py @@ -178,7 +178,6 @@ class WebServer: raise HTTPInternalServerError - async def _restart_helper_bot(self) -> None: await bumper.mqtt_helperbot.disconnect() asyncio.create_task(bumper.mqtt_helperbot.start()) @@ -374,7 +373,7 @@ class WebServer: except asyncio.CancelledError: proxymodelog.exception( - f"Request cancelled or timeout - {request.url} - {jdata}", exc_info=True + f"Request cancelled or timeout - {request.url}", exc_info=True ) except Exception: