fix: wsNetConn cancel on any error

mafredri · mafredri · commit 3f8c815b273e · 2022-06-02T16:37:37.000+03:00
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -510,23 +509,23 @@ func convertWorkspaceAgent(dbAgent database.WorkspaceAgent, agentUpdateFrequency
 }
 
 // wsNetConn wraps net.Conn created by websocket.NetConn(). Cancel func
-// is called if io.EOF is encountered.
+// is called if a read or write error is encountered.
 type wsNetConn struct {
 	cancel context.CancelFunc
 	net.Conn
 }
 
 func (c *wsNetConn) Read(b []byte) (n int, err error) {
 	n, err = c.Conn.Read(b)
-	if errors.Is(err, io.EOF) {
+	if err != nil {
 		c.cancel()
 	}
 	return n, err
 }
 
 func (c *wsNetConn) Write(b []byte) (n int, err error) {
 	n, err = c.Conn.Write(b)
-	if errors.Is(err, io.EOF) {
+	if err != nil {
 		c.cancel()
 	}
 	return n, err
@@ -538,8 +537,8 @@ func (c *wsNetConn) Close() error {
 }
 
 // websocketNetConn wraps websocket.NetConn and returns a context that
-// is tied to the parent context and the lifetime of the conn. A io.EOF
-// error during read or write will cancel the context, but not close the
+// is tied to the parent context and the lifetime of the conn. Any error
+// during read or write will cancel the context, but not close the
 // conn. Close should be called to release context resources.
 func websocketNetConn(ctx context.Context, conn *websocket.Conn, msgType websocket.MessageType) (context.Context, net.Conn) {
 	ctx, cancel := context.WithCancel(ctx)
