sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conn: drop ErrClosed workaround for WebSocket

Browse Source 
The fix has been merged upstream.
This commit is contained in:
Simon Ser 2023-11-25 08:14:45 +01:00
parent c859d2134a
commit 47346b0f10
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conn.go
View File

@ -76,18 +76,8 @@ func (wic *websocketIRCConn) WriteMessage(msg *irc.Message) error {
return wic.conn.Write(ctx, websocket.MessageText, b) return wic.conn.Write(ctx, websocket.MessageText, b)
} }
func isErrWebSocketClosed(err error) bool {
return err != nil && strings.HasSuffix(err.Error(), "failed to close WebSocket: already wrote close")
}
func (wic *websocketIRCConn) Close() error { func (wic *websocketIRCConn) Close() error {
err := wic.conn.Close(websocket.StatusNormalClosure, "") return wic.conn.Close(websocket.StatusNormalClosure, "")
// TODO: remove once this PR is merged:
// https://github.com/nhooyr/websocket/pull/303
if isErrWebSocketClosed(err) {
return nil
}
return err
} }
func (wic *websocketIRCConn) SetReadDeadline(t time.Time) error { func (wic *websocketIRCConn) SetReadDeadline(t time.Time) error {