Commit779b90e

committed

wait for conn to close

1 parent8022a43 commit779b90eCopy full SHA for 779b90e

File tree

-2

lines changed

-2

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -314,14 +314,21 @@ func AgentInfo(ctx context.Context, client *codersdk.Client, log slog.Logger, ag`
`314`	`314`	`returnnil`
`315`	`315`	`})`
`316`	`316`
`317`		`-conn,err:=client.DialWorkspaceAgent(ctx,agentID,&codersdk.DialWorkspaceAgentOptions{`
	`317`	`+dialCtx,dialCancel:=context.WithCancel(ctx)`
	`318`	`+deferdialCancel()`
	`319`	`+conn,err:=client.DialWorkspaceAgent(dialCtx,agentID,&codersdk.DialWorkspaceAgentOptions{`
`318`	`320`	`Logger:log.Named("dial-agent"),`
`319`	`321`	`BlockEndpoints:false,`
`320`	`322`	`})`
`321`	`323`	`iferr!=nil {`
`322`	`324`	`log.Error(ctx,"dial agent",slog.Error(err))`
`323`	`325`	`}else {`
`324`		`-deferconn.Close()`
	`326`	`+deferfunc() {`
	`327`	`+iferr:=conn.Close();err!=nil {`
	`328`	`+log.Error(ctx,"failed to close agent connection",slog.Error(err))`
	`329`	`+}`
	`330`	`+<-conn.Closed()`
	`331`	`+}()`
`325`	`332`	`if!conn.AwaitReachable(ctx) {`
`326`	`333`	`log.Error(ctx,"timed out waiting for agent")`
`327`	`334`	`}else {`

Comments

(0)