fix: Close coordinator on context cancellation

mafredri · mafredri · commit d84d792d100a · 2022-09-23T11:28:35.000+03:00
diff --git a/agent/agent.go b/agent/agent.go
@@ -288,6 +288,8 @@ func (a *agent) runCoordinator(ctx context.Context) {
 			a.logger.Warn(context.Background(), "failed to dial", slog.Error(err))
 			continue
 		}
+		//nolint:revive // Defer is ok because we're exiting this loop.
+		defer coordinator.Close()
 		a.logger.Info(context.Background(), "connected to coordination server")
 		break
 	}
@@ -296,7 +298,6 @@ func (a *agent) runCoordinator(ctx context.Context) {
 		return
 	default:
 	}
-	defer coordinator.Close()
 	sendNodes, errChan := tailnet.ServeCoordinator(coordinator, a.network.UpdateNodes)
 	a.network.SetNodeCallback(sendNodes)
 	select {

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,8 @@ func (a *agent) runCoordinator(ctx context.Context) {`
`288`	`288`	`a.logger.Warn(context.Background(), "failed to dial", slog.Error(err))`
`289`	`289`	`continue`
`290`	`290`	`}`
	`291`	`+ //nolint:revive // Defer is ok because we're exiting this loop.`
	`292`	`+ defer coordinator.Close()`
`291`	`293`	`a.logger.Info(context.Background(), "connected to coordination server")`
`292`	`294`	`break`
`293`	`295`	`}`
`@@ -296,7 +298,6 @@ func (a *agent) runCoordinator(ctx context.Context) {`
`296`	`298`	`return`
`297`	`299`	`default:`
`298`	`300`	`}`
`299`		`- defer coordinator.Close()`
`300`	`301`	`sendNodes, errChan := tailnet.ServeCoordinator(coordinator, a.network.UpdateNodes)`
`301`	`302`	`a.network.SetNodeCallback(sendNodes)`
`302`	`303`	`select {`