Commit 74b476f
fix: catch ClosedResourceError when sending error log to disconnected client
When a client disconnects during request handling, _handle_message's
error handler tries to send_log_message() back to the client. Since the
write stream is already closed, this raises ClosedResourceError (or
BrokenResourceError), which is unhandled and crashes the stateless
session with an ExceptionGroup.
This is a different code path from what PR #1384 fixed (message router
loop). This bug is in the error recovery path: catch exception → try to
log it to client → write stream already closed → crash.
Added try/except around send_log_message() to catch both
ClosedResourceError and BrokenResourceError, logging a debug message
instead of crashing.
Fixes #2064
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent 62575ed commit 74b476f
File tree
2 files changed
+57
-5
lines changed- src/mcp/server/lowlevel
- tests/server
2 files changed
+57
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
417 | 417 | | |
418 | 418 | | |
419 | 419 | | |
420 | | - | |
421 | | - | |
422 | | - | |
423 | | - | |
424 | | - | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
425 | 428 | | |
426 | 429 | | |
427 | 430 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
0 commit comments