Use net.ErrClosed

emersion · emersion · commit a378643ba086 · 2023-03-07T16:21:17.000+01:00
Go 1.16 has introduced net.ErrClosed, which should be returned/wrapped when an I/O call is performed on a network connection which has already been closed. This is useful to avoid cluttering logs with messages like "failed to close WebSocket: already wrote close". Closes: #286
diff --git a/close_go113.go b/close_go113.go
@@ -0,0 +1,9 @@
+// +build !go1.16
+
+package websocket
+
+import (
+	"errors"
+)
+
+var errClosed = errors.New("use of closed network connection")
diff --git a/close_go116.go b/close_go116.go
@@ -0,0 +1,9 @@
+// +build go1.16
+
+package websocket
+
+import (
+	"net"
+)
+
+var errClosed = net.ErrClosed
diff --git a/close_notjs.go b/close_notjs.go
@@ -5,7 +5,6 @@ package websocket
 import (
 	"context"
 	"encoding/binary"
-	"errors"
 	"fmt"
 	"log"
 	"time"
@@ -48,15 +47,13 @@ func (c *Conn) closeHandshake(code StatusCode, reason string) (err error) {
 	return nil
 }
 
-var errAlreadyWroteClose = errors.New("already wrote close")
-
 func (c *Conn) writeClose(code StatusCode, reason string) error {
 	c.closeMu.Lock()
 	wroteClose := c.wroteClose
 	c.wroteClose = true
 	c.closeMu.Unlock()
 	if wroteClose {
-		return errAlreadyWroteClose
+		return errClosed
 	}
 
 	ce := CloseError{
