fix(publicip): abort ip data fetch if vpn context is canceled

- Prevents requesting the public IP address N times after N VPN failures
- Fetching runs with a context local to the 'single run'
- Single run writes single run result to a channel back to the caller, RunOnce is now blocking
This commit is contained in:
Quentin McGaw
2024-05-18 18:06:01 +00:00
parent b504227625
commit efecb0ea0e
3 changed files with 50 additions and 46 deletions

View File

@@ -90,6 +90,6 @@ type DNSLoop interface {
}
type PublicIPLoop interface {
StartSingleRun()
RunOnce(ctx context.Context) (err error)
ClearData() (err error)
}

View File

@@ -28,7 +28,10 @@ func (l *Loop) onTunnelUp(ctx context.Context, data tunnelUpData) {
_, _ = l.dnsLooper.ApplyStatus(ctx, constants.Running)
}
l.publicip.StartSingleRun()
err := l.publicip.RunOnce(ctx)
if err != nil {
l.logger.Error("getting public IP address information: " + err.Error())
}
if l.versionInfo {
l.versionInfo = false // only get the version information once
@@ -40,7 +43,7 @@ func (l *Loop) onTunnelUp(ctx context.Context, data tunnelUpData) {
}
}
err := l.startPortForwarding(data)
err = l.startPortForwarding(data)
if err != nil {
l.logger.Error(err.Error())
}