Commitf3db876

authored

fix: stop reading closed channel for/watch devcontainers endpoint (#19373) (#20095)

1 parenta9bdbdb commitf3db876Copy full SHA for f3db876

File tree

+251

-151

lines changed

+251

-151

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,11 @@ func (api *API) broadcastUpdatesLocked() {`
`763`	`763`	`func (apiAPI)watchContainers(rw http.ResponseWriter,rhttp.Request) {`
`764`	`764`	`ctx:=r.Context()`
`765`	`765`
`766`		`-conn,err:=websocket.Accept(rw,r,nil)`
	`766`	`+conn,err:=websocket.Accept(rw,r,&websocket.AcceptOptions{`
	`767`	+// We want `NoContextTakeover` compression to balance improving
	`768`	`+// bandwidth cost/latency with minimal memory usage overhead.`
	`769`	`+CompressionMode:websocket.CompressionNoContextTakeover,`
	`770`	`+})`
`767`	`771`	`iferr!=nil {`
`768`	`772`	`httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{`
`769`	`773`	`Message:"Failed to upgrade connection to websocket.",`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -899,7 +899,11 @@ func (api API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r http.Re`
`899`	`899`	`case<-ctx.Done():`
`900`	`900`	`return`
`901`	`901`
`902`		`-casecontainers:=<-containersCh:`
	`902`	`+casecontainers,ok:=<-containersCh:`
	`903`	`+if!ok {`
	`904`	`+return`
	`905`	`+}`
	`906`	`+`
`903`	`907`	`iferr:=encoder.Encode(containers);err!=nil {`
`904`	`908`	`api.Logger.Error(ctx,"encode containers",slog.Error(err))`
`905`	`909`	`return`

Comments

(0)