Skip to content

fix: Improve agent connection tracking when agent is closed #5253

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 2, 2022
Merged

fix: Improve agent connection tracking when agent is closed #5253

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
874eff6
fix: Improve agent connection tracking when agent is closed
mafredri Dec 2, 2022
3b0fe00
Merge branch 'main' into mafredri/fix-agent-connection-tracking
mafredri Dec 2, 2022
71071d5
Also close tailnet if there was an error
mafredri Dec 2, 2022
6f9b319
Avoid double assign of `a.network`
mafredri Dec 2, 2022
a0de5a0
Revert "Avoid double assign of `a.network`"
mafredri Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Also close tailnet if there was an error
  • Loading branch information
@mafredri
mafredri committed Dec 2, 2022
commit 71071d5e399c3bee935038a6b98a3e117236b3d7
5 changes: 5 additions & 0 deletions agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (ne
a.closeMutex.Unlock()
return nil, xerrors.Errorf("create tailnet: %w", err)
}
defer func() {
if err != nil {
network.Close()
}
}()
a.network = network
a.closeMutex.Unlock()

Expand Down