Commit 6d9194cf authored by Matthias Radestock's avatar Matthias Radestock
Browse files

treat EOF and ErrClosedPipe in websocket connections as uninteresting

both occur in various states of disconnectedness
parent 4d746a6c
Showing with 2 additions and 4 deletions
+2 -4
package app
import (
"io"
"net/http"
"net/rpc"
......@@ -84,7 +83,7 @@ func handleProbeWS(cr ControlRouter) CtxHandlerFunc {
return
}
defer cr.Deregister(ctx, probeID, id)
if err := codec.WaitForReadError(); err != nil && err != io.EOF && !xfer.IsExpectedWSCloseError(err) {
if err := codec.WaitForReadError(); err != nil && !xfer.IsExpectedWSCloseError(err) {
log.Errorf("Error on websocket: %v", err)
}
}
......
......@@ -167,8 +167,7 @@ func (p *pingingWebsocket) Close() error {
// IsExpectedWSCloseError returns boolean indicating whether the error is a
// clean disconnection.
func IsExpectedWSCloseError(err error) bool {
return websocket.IsCloseError(
err,
return err == io.EOF || err == io.ErrClosedPipe || websocket.IsCloseError(err,
websocket.CloseNormalClosure,
websocket.CloseGoingAway,
websocket.CloseNoStatusReceived,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment