mcp/server: make Run return on context cancel #111
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jba
requested changes
Jul 9, 2025
mcp/cmd_test.go
Outdated
| session, err := client.Connect(ctx, mcp.NewCommandTransport(cmd)) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| log.Fatal(err) |
Contributor
There was a problem hiding this comment.
I must be missing something. Why switch to log?
Contributor
Author
There was a problem hiding this comment.
This test file was already using log -- I will replace it.
Contributor
There was a problem hiding this comment.
Never mind, I see the logs were there originally because this sometimes runs as a sub-process. You can leave them. Sorry for the noise.
Contributor
Author
There was a problem hiding this comment.
No problem -- I think runServer is the only function called in the sub-process, and it is still using log, so should be set.
Make `Server.Run` return when the provided context is canceled. Add tests for when the `Run` context is cancelled and also for when the server process receives a signal. Fixes modelcontextprotocol#107
chriscasola
force-pushed
the
server-context-cancel
branch
from
b3f9138 to
5ba4d6e
Compare
jba
approved these changes
Jul 10, 2025
Contributor
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make
Server.Runreturn when the provided context is canceled.Add tests for when the
Runcontext is cancelled and also for when the server process receives a signal.Fixes #107