Skip to content

Improve exception handling for ClientDisconnect errors #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Open

Improve exception handling for ClientDisconnect errors #1647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/mcp/server/streamable_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
from pydantic import ValidationError
from sse_starlette import EventSourceResponse
from starlette.requests import Request
from starlette.requests import ClientDisconnect, Request
from starlette.responses import Response
from starlette.types import Receive, Scope, Send

Expand Down Expand Up @@ -511,6 +511,15 @@ async def sse_writer():
await sse_stream_reader.aclose()
await self._clean_up_memory_streams(request_id)

except ClientDisconnect:
logger.info("Client disconnected during request")
response = self._create_error_response(
"Client closed connection",
499,
)
await response(scope, receive, send)
return

except Exception as err: # pragma: no cover
logger.exception("Error handling POST request")
response = self._create_error_response(
Expand Down
Loading