Feb 1, 2024 · Jan 30, 2024
diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
 returnnil,codersdk.ReadBodyAsError(res)
 }

 ctx,cancelFunc:=context.WithCancel(ctx)
 ctx,wsNetConn:=websocketNetConn(ctx,conn,websocket.MessageBinary)
 pingClosed:=pingWebSocket(ctx,c.SDK.Logger(),conn,"coordinate")
 _,wsNetConn:=websocketNetConn(ctx,conn,websocket.MessageBinary)

 netConn:=&closeNetConn{
 Conn:wsNetConn,
 closeFunc:func() {
 cancelFunc()
 _=conn.Close(websocket.StatusGoingAway,"Listen closed")
 <-pingClosed
 },
 }
 config:=yamux.DefaultConfig()
 c.closeFunc()
 returnc.Conn.Close()
 }

 funcpingWebSocket(ctx context.Context,logger slog.Logger,conn*websocket.Conn,namestring)<-chanstruct{} {
 // Ping once every 30 seconds to ensure that the websocket is alive. If we
 // don't get a response within 30s we kill the websocket and reconnect.
 // See: https://github.com/coder/coder/pull/5824
 closed:=make(chanstruct{})
 gofunc() {
 deferclose(closed)
 tick:=30*time.Second
 ticker:=time.NewTicker(tick)
 deferticker.Stop()
 deferfunc() {
 logger.Debug(ctx,fmt.Sprintf("%s pinger exited",name))
 }()
 for {
 select {
 case<-ctx.Done():
 return
 casestart:=<-ticker.C:
 ctx,cancel:=context.WithTimeout(ctx,tick)

 err:=conn.Ping(ctx)
 iferr!=nil {
 logger.Error(ctx,fmt.Sprintf("workspace agent %s ping",name),slog.Error(err))

 err:=conn.Close(websocket.StatusGoingAway,"Ping failed")
 iferr!=nil {
 logger.Error(ctx,fmt.Sprintf("close workspace agent %s websocket",name),slog.Error(err))
 }

 cancel()
 return
 }

 logger.Debug(ctx,fmt.Sprintf("got %s ping",name),slog.F("took",time.Since(start)))
 cancel()
 }
 }
 }()

 returnclosed
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -205,16 +205,12 @@ func (c *Client) Listen(ctx context.Context) (drpc.Conn, error) {
		returnnil,codersdk.ReadBodyAsError(res)
		}

		ctx,cancelFunc:=context.WithCancel(ctx)
		ctx,wsNetConn:=websocketNetConn(ctx,conn,websocket.MessageBinary)
		pingClosed:=pingWebSocket(ctx,c.SDK.Logger(),conn,"coordinate")
		_,wsNetConn:=websocketNetConn(ctx,conn,websocket.MessageBinary)

		netConn:=&closeNetConn{
		Conn:wsNetConn,
		closeFunc:func() {
		cancelFunc()
		_=conn.Close(websocket.StatusGoingAway,"Listen closed")
		<-pingClosed
		},
		}
		config:=yamux.DefaultConfig()
Expand DownExpand Up		@@ -720,45 +716,3 @@ func (c *closeNetConn) Close() error {
		c.closeFunc()
		returnc.Conn.Close()
		}

		funcpingWebSocket(ctx context.Context,logger slog.Logger,conn*websocket.Conn,namestring)<-chanstruct{} {
		// Ping once every 30 seconds to ensure that the websocket is alive. If we
		// don't get a response within 30s we kill the websocket and reconnect.
		// See: https://github.com/coder/coder/pull/5824
		closed:=make(chanstruct{})
		gofunc() {
		deferclose(closed)
		tick:=30*time.Second
		ticker:=time.NewTicker(tick)
		deferticker.Stop()
		deferfunc() {
		logger.Debug(ctx,fmt.Sprintf("%s pinger exited",name))
		}()
		for {
		select {
		case<-ctx.Done():
		return
		casestart:=<-ticker.C:
		ctx,cancel:=context.WithTimeout(ctx,tick)

		err:=conn.Ping(ctx)
		iferr!=nil {
		logger.Error(ctx,fmt.Sprintf("workspace agent %s ping",name),slog.Error(err))

		err:=conn.Close(websocket.StatusGoingAway,"Ping failed")
		iferr!=nil {
		logger.Error(ctx,fmt.Sprintf("close workspace agent %s websocket",name),slog.Error(err))
		}

		cancel()
		return
		}

		logger.Debug(ctx,fmt.Sprintf("got %s ping",name),slog.F("took",time.Since(start)))
		cancel()
		}
		}
		}()

		returnclosed
		}