TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-02 05:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlhttp: reduce some log spam on context cancel

Browse Source 
Change-Id: I3ac00ddb29c16e9791ab2be19f454dabd721e4c3
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2025-03-30 21:12:29 -07:00 committed by Brad Fitzpatrick
parent 4c9b37fa2e
commit 29c2bb1db6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
control/controlhttp/client.go
View File

@ -249,6 +249,11 @@ func (a *Dialer) dial(ctx context.Context) (*ClientConn, error) {
results[i].conn = nil // so we don't close it in the defer results[i].conn = nil // so we don't close it in the defer
return conn, nil return conn, nil
} }
if ctx.Err() != nil {
a.logf("controlhttp: context aborted dialing")
return nil, ctx.Err()
}
merr := multierr.New(errs...) merr := multierr.New(errs...)
// If we get here, then we didn't get anywhere with our dial plan; fall back to just using DNS. // If we get here, then we didn't get anywhere with our dial plan; fall back to just using DNS.