Commit0a354b6

committed

fix: Use of r.Context() in workspaceAgentDial

1 parent877959b commit0a354b6Copy full SHA for 0a354b6

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,17 +72,18 @@ func (api API) workspaceAgentDial(rw http.ResponseWriter, r http.Request) {`
`72`	`72`	`})`
`73`	`73`	`return`
`74`	`74`	`}`
`75`		`-deferfunc() {`
`76`		`-_=conn.Close(websocket.StatusNormalClosure,"")`
`77`		`-}()`
	`75`	`+`
	`76`	`+ctx,wsNetConn:=websocketNetConn(r.Context(),conn,websocket.MessageBinary)`
	`77`	`+deferwsNetConn.Close()// Also closes conn.`
	`78`	`+`
`78`	`79`	`config:=yamux.DefaultConfig()`
`79`	`80`	`config.LogOutput=io.Discard`
`80`		`-session,err:=yamux.Server(websocket.NetConn(r.Context(),conn,websocket.MessageBinary),config)`
	`81`	`+session,err:=yamux.Server(wsNetConn,config)`
`81`	`82`	`iferr!=nil {`
`82`	`83`	`_=conn.Close(websocket.StatusAbnormalClosure,err.Error())`
`83`	`84`	`return`
`84`	`85`	`}`
`85`		`-err=peerbroker.ProxyListen(r.Context(),session, peerbroker.ProxyOptions{`
	`86`	`+err=peerbroker.ProxyListen(ctx,session, peerbroker.ProxyOptions{`
`86`	`87`	`ChannelID:workspaceAgent.ID.String(),`
`87`	`88`	`Logger:api.Logger.Named("peerbroker-proxy-dial"),`
`88`	`89`	`Pubsub:api.Pubsub,`

Comments

(0)