Skip to content

Do not run OnReadMessageError when a connection closes normally #488

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
tigrannajaryan merged 1 commit into from
Jan 9, 2026
Merged

Do not run OnReadMessageError when a connection closes normally #488

Show file tree
Hide file tree
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
12 changes: 7 additions & 5 deletions server/serverimpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,12 @@ func (s *server) handleWSConnection(reqCtx context.Context, wsConn *websocket.Co
mt, msgBytes, err := wsConn.ReadMessage()
isBreak, err := func() (bool, error) {
if err != nil {
if !websocket.IsUnexpectedCloseError(err) {
s.logger.Errorf(msgContext, "Cannot read a message from WebSocket: %v", err)
if !websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) {
// This is a normal closing of the WebSocket connection.
s.logger.Debugf(msgContext, "Agent disconnected: %v", err)
return true, err
}
// This is a normal closing of the WebSocket connection.
s.logger.Debugf(msgContext, "Agent disconnected: %v", err)
s.logger.Errorf(msgContext, "Cannot read a message from WebSocket: %v", err)
return true, err
}
if mt != websocket.BinaryMessage {
Expand All @@ -279,7 +279,9 @@ func (s *server) handleWSConnection(reqCtx context.Context, wsConn *websocket.Co
return false, nil
}()
if err != nil {
connectionCallbacks.OnReadMessageError(agentConn, mt, msgBytes, err)
if !websocket.IsCloseError(err, websocket.CloseNormalClosure) {
connectionCallbacks.OnReadMessageError(agentConn, mt, msgBytes, err)
}
if isBreak {
break
}
Expand Down
4 changes: 2 additions & 2 deletions server/serverimpl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@ func TestDisconnectServerWSConnection(t *testing.T) {
return err != nil
})

// We expect exactly one error log
require.Equal(t, 1, len(logger.errorLogs))
// We expect exactly one debug log
require.Equal(t, 1, len(logger.debugLogs))
}

var testInstanceUid = []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6}
Expand Down
Loading