Skip to content

Commit d242e76

Browse files
committed
not showing cancellation message when the task completed
1 parent 880f3a5 commit d242e76

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

packages/service-library/src/servicelib/fastapi/cancellation_middleware.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ async def _message_poller(
2020
while True:
2121
message = await receive()
2222
if message["type"] == "http.disconnect":
23-
_logger.info("client disconnected, terminating request to %s!", request.url)
23+
_logger.debug(
24+
"client disconnected, terminating request to %s!", request.url
25+
)
2426
raise _TerminateTaskGroupError
2527

2628
# Puts the message in the queue
@@ -57,7 +59,6 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
5759

5860
# Let's make a shared queue for the request messages
5961
queue: asyncio.Queue[Message] = asyncio.Queue()
60-
6162
request = Request(scope)
6263

6364
with log_context(_logger, logging.DEBUG, f"cancellable request {request.url}"):
@@ -72,6 +73,8 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
7273
await handler_task
7374
poller_task.cancel()
7475
except* _TerminateTaskGroupError:
75-
_logger.info(
76-
"The client disconnected. request to %s was cancelled.", request.url
77-
)
76+
if not handler_task.done():
77+
_logger.info(
78+
"The client disconnected. request to %s was cancelled.",
79+
request.url,
80+
)

0 commit comments

Comments
 (0)