Commit88d49db

authored

fix: Add isFirst check before err check (#4326)

This was causing TestBlockNonBrowser to hang and fail.

1 parentc7aea2f commit88d49dbCopy full SHA for 88d49db

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -331,21 +331,21 @@ func (c *Client) DialWorkspaceAgentTailnet(ctx context.Context, logger slog.Logg`
`331`	`331`	`// Need to disable compression to avoid a data-race.`
`332`	`332`	`CompressionMode:websocket.CompressionDisabled,`
`333`	`333`	`})`
`334`		`-iferr!=nil {`
`335`		`-iferrors.Is(err,context.Canceled) {`
`336`		`-return`
`337`		`-}`
`338`		`-logger.Debug(ctx,"failed to dial",slog.Error(err))`
`339`		`-continue`
`340`		`-}`
`341`	`334`	`ifisFirst {`
`342`		`-ifres.StatusCode==http.StatusConflict {`
	`335`	`+iferr!=nil&&res.StatusCode==http.StatusConflict {`
`343`	`336`	`first<-readBodyAsError(res)`
`344`	`337`	`return`
`345`	`338`	`}`
`346`	`339`	`isFirst=false`
`347`	`340`	`close(first)`
`348`	`341`	`}`
	`342`	`+iferr!=nil {`
	`343`	`+iferrors.Is(err,context.Canceled) {`
	`344`	`+return`
	`345`	`+}`
	`346`	`+logger.Debug(ctx,"failed to dial",slog.Error(err))`
	`347`	`+continue`
	`348`	`+}`
`349`	`349`	`sendNode,errChan:=tailnet.ServeCoordinator(websocket.NetConn(ctx,ws,websocket.MessageBinary),func(node []*tailnet.Node)error {`
`350`	`350`	`returnconn.UpdateNodes(node)`
`351`	`351`	`})`

Comments

(0)