Apr 10, 2024 · Apr 10, 2024 · Apr 10, 2024 · Apr 10, 2024
diff --git a/coderd/workspaceagentsrpc.go b/coderd/workspaceagentsrpc.go
 "context"
 "database/sql"
 "fmt"
 "io"
 "net/http"
 "runtime/pprof"
 "sync"
 ctx = tailnet.WithStreamID(ctx, streamID)
 ctx = agentapi.WithAPIVersion(ctx, version)
 err = agentAPI.Serve(ctx, mux)
 if err != nil {
 if err != nil&& !xerrors.Is(err, yamux.ErrSessionShutdown) && !xerrors.Is(err, io.EOF){
 logger.Warn(ctx, "workspace agent RPC listen error", slog.Error(err))
 _ = conn.Close(websocket.StatusInternalError, err.Error())
 return
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@ import (
		"context"
		"database/sql"
		"fmt"
		"io"
		"net/http"
		"runtime/pprof"
		"sync"
Expand DownExpand Up		@@ -156,7 +157,7 @@ func (api API) workspaceAgentRPC(rw http.ResponseWriter, r http.Request) {
		ctx = tailnet.WithStreamID(ctx, streamID)
		ctx = agentapi.WithAPIVersion(ctx, version)
		err = agentAPI.Serve(ctx, mux)
		if err != nil {
		if err != nil&& !xerrors.Is(err, yamux.ErrSessionShutdown) && !xerrors.Is(err, io.EOF){
		logger.Warn(ctx, "workspace agent RPC listen error", slog.Error(err))
		_ = conn.Close(websocket.StatusInternalError, err.Error())
Copy link Member deansheatherApr 10, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Should you still call close even on these errors? Copy link ContributorAuthor spikecurtisApr 10, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I don't think so. The netConn is closed via a`defer`, which closes the underlying websocket --- the only difference is that it will send`NormalClosure` rather than`InternalError`, which seems fine for these error types.
		return
Expand Down