- Notifications
You must be signed in to change notification settings - Fork928
fix: Add isFirst check before err check#4326
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Changes fromall commits
File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -331,21 +331,21 @@ func (c *Client) DialWorkspaceAgentTailnet(ctx context.Context, logger slog.Logg | ||
| // Need to disable compression to avoid a data-race. | ||
| CompressionMode: websocket.CompressionDisabled, | ||
| }) | ||
| if isFirst { | ||
| iferr != nil &&res.StatusCode == http.StatusConflict { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Should this be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Ahh, you're correct. I'll fix this now in another PR. I merged due to panic of There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. It seems the error isn't nil there actually, so a weird case. I'm just going to check for the status code, then it should be fine! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. | ||
| first <- readBodyAsError(res) | ||
| return | ||
| } | ||
| isFirst = false | ||
| close(first) | ||
| } | ||
| if err != nil { | ||
| if errors.Is(err, context.Canceled) { | ||
| return | ||
| } | ||
| logger.Debug(ctx, "failed to dial", slog.Error(err)) | ||
| continue | ||
| } | ||
| sendNode, errChan := tailnet.ServeCoordinator(websocket.NetConn(ctx, ws, websocket.MessageBinary), func(node []*tailnet.Node) error { | ||
| return conn.UpdateNodes(node) | ||
| }) | ||