fix: stop logging session shutdown as warning #12922
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
|
This stack of pull requests is managed by Graphite. Learn more about stacking. Join @spikecurtis and the rest of your teammates on |
deansheather
approved these changes
Apr 10, 2024
| @@ -156,7 +157,7 @@ func (api *API) workspaceAgentRPC(rw http.ResponseWriter, r *http.Request) { | |||
| ctx = tailnet.WithStreamID(ctx, streamID) | |||
| ctx = agentapi.WithAPIVersion(ctx, version) | |||
| err = agentAPI.Serve(ctx, mux) | |||
| if err != nil { | |||
| if err != nil && !xerrors.Is(err, yamux.ErrSessionShutdown) && !xerrors.Is(err, io.EOF) { | |||
| logger.Warn(ctx, "workspace agent RPC listen error", slog.Error(err)) | |||
| _ = conn.Close(websocket.StatusInternalError, err.Error()) | |||
There was a problem hiding this comment.
Should you still call close even on these errors?
There was a problem hiding this comment.
I don't think so. The netConn is closed via a defer, which closes the underlying websocket --- the only difference is that it will send NormalClosure rather than InternalError, which seems fine for these error types.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
A customer hit like 200k of ErrSessionShutdown, which just dupes any errors we would have generated when shutting down the session for e.g. Ping failures.