From 79b0fb4690cc68186cb1c946933a48ce23551266 Mon Sep 17 00:00:00 2001 From: Amin Alaee Date: Wed, 15 Dec 2021 17:45:14 +0100 Subject: [PATCH] Remove root_path from logs --- uvicorn/protocols/utils.py | 4 +--- uvicorn/protocols/websockets/websockets_impl.py | 4 ++-- uvicorn/protocols/websockets/wsproto_impl.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/uvicorn/protocols/utils.py b/uvicorn/protocols/utils.py index bbc84f7aa..1da733600 100644 --- a/uvicorn/protocols/utils.py +++ b/uvicorn/protocols/utils.py @@ -46,9 +46,7 @@ def get_client_addr(scope: WWWScope) -> str: def get_path_with_query_string(scope: WWWScope) -> str: - path_with_query_string = urllib.parse.quote( - scope.get("root_path", "") + scope["path"] - ) + path_with_query_string = urllib.parse.quote(scope["path"]) if scope["query_string"]: path_with_query_string = "{}?{}".format( path_with_query_string, scope["query_string"].decode("ascii") diff --git a/uvicorn/protocols/websockets/websockets_impl.py b/uvicorn/protocols/websockets/websockets_impl.py index 7caabadc6..af0f954e6 100644 --- a/uvicorn/protocols/websockets/websockets_impl.py +++ b/uvicorn/protocols/websockets/websockets_impl.py @@ -227,7 +227,7 @@ async def asgi_send(self, message): self.logger.info( '%s - "WebSocket %s" [accepted]', self.scope["client"], - self.scope["root_path"] + self.scope["path"], + self.scope["path"], ) self.initial_response = None self.accepted_subprotocol = message.get("subprotocol") @@ -237,7 +237,7 @@ async def asgi_send(self, message): self.logger.info( '%s - "WebSocket %s" 403', self.scope["client"], - self.scope["root_path"] + self.scope["path"], + self.scope["path"], ) self.initial_response = (http.HTTPStatus.FORBIDDEN, [], b"") self.handshake_started_event.set() diff --git a/uvicorn/protocols/websockets/wsproto_impl.py b/uvicorn/protocols/websockets/wsproto_impl.py index 704d6b8cb..6a08b5475 100644 --- a/uvicorn/protocols/websockets/wsproto_impl.py +++ b/uvicorn/protocols/websockets/wsproto_impl.py @@ -253,7 +253,7 @@ async def send(self, message): self.logger.info( '%s - "WebSocket %s" [accepted]', self.scope["client"], - self.scope["root_path"] + self.scope["path"], + self.scope["path"], ) self.handshake_complete = True subprotocol = message.get("subprotocol") @@ -269,7 +269,7 @@ async def send(self, message): self.logger.info( '%s - "WebSocket %s" 403', self.scope["client"], - self.scope["root_path"] + self.scope["path"], + self.scope["path"], ) self.handshake_complete = True self.close_sent = True