Skip to content

chore: do not log client cancellation as errors #1231

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

Merged
StarpTech merged 4 commits into from
Sep 30, 2024
Merged

chore: do not log client cancellation as errors #1231

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd78dd5
chore: do not log client cancellation as errors
StarpTech Sep 30, 2024
5f5cc3d
chore: use req logger
StarpTech Sep 30, 2024
bf552e8
chore: use req logger
StarpTech Sep 30, 2024
d704152
chore: improve err msg
StarpTech Sep 30, 2024
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
13 changes: 8 additions & 5 deletions router/core/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func (h *WebsocketHandler) handleUpgradeRequest(w http.ResponseWriter, r *http.R
// We can parse the request options before creating the handler
// this avoids touching the client request across goroutines

executionOptions, traceOptions, err := h.preHandler.parseRequestOptions(r, clientInfo, h.logger)
executionOptions, traceOptions, err := h.preHandler.parseRequestOptions(r, clientInfo, requestLogger)
if err != nil {
requestLogger.Error("Parse request options", zap.Error(err))
_ = c.Close()
Expand Down Expand Up @@ -322,7 +322,13 @@ func (h *WebsocketHandler) handleUpgradeRequest(w http.ResponseWriter, r *http.R
})
err = handler.Initialize()
if err != nil {
requestLogger.Error("Initializing websocket connection", zap.Error(err))
if errors.Is(err, io.EOF) {
requestLogger.Warn("No more data to read during initialization", zap.Error(err))
} else if errors.As(err, &wsutil.ClosedError{}) {
requestLogger.Warn("Client closed connection during initialization", zap.Error(err))
} else {
requestLogger.Error("Initializing websocket connection", zap.Error(err))
}
handler.Close()
return
}
Expand Down Expand Up @@ -964,9 +970,6 @@ func (h *WebSocketConnectionHandler) Initialize() (err error) {
h.logger.Debug("Websocket connection", zap.String("protocol", h.protocol.Subprotocol()))
h.initialPayload, err = h.protocol.Initialize()
if err != nil {
if !errors.Is(err, io.EOF) {
h.logger.Error("Initializing websocket connection", zap.Error(err))
}
_ = h.requestError(fmt.Errorf("error initializing session"))
return err
}
Expand Down