TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal, wgengine/magicsock, logpolicy: quiet more logs

Browse Source 
Updates #1548

Change-Id: Ied169f872e93be2857890211f2e018307d4aeadc
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-02-12 16:22:33 -08:00 committed by Brad Fitzpatrick
parent be9d564c29
commit 2db6cd1025
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -607,7 +607,7 @@ func (b *LocalBackend) setClientStatus(st controlclient.Status) {
if strings.TrimSpace(diff) == "" { if strings.TrimSpace(diff) == "" {
b.logf("[v1] netmap diff: (none)") b.logf("[v1] netmap diff: (none)")
} else { } else {
b.logf("netmap diff:\n%v", diff) b.logf("[v1] netmap diff:\n%v", diff)
} }
} }

19
logpolicy/logpolicy.go
View File

@ -571,6 +571,16 @@ func New(collection string) *Policy {
} }
} }
// dialLog is used by NewLogtailTransport to log the happy path of its
// own dialing.
//
// By default it goes nowhere and is only enabled when
// tailscaled's in verbose mode.
//
// log.Printf isn't used so its own logs don't loop back into logtail
// in the happy path, thus generating more logs.
var dialLog = log.New(io.Discard, "logtail: ", log.LstdFlags|log.Lmsgprefix)
// SetVerbosityLevel controls the verbosity level that should be // SetVerbosityLevel controls the verbosity level that should be
// written to stderr. 0 is the default (not verbose). Levels 1 or higher // written to stderr. 0 is the default (not verbose). Levels 1 or higher
// are increasingly verbose. // are increasingly verbose.
@ -578,6 +588,9 @@ func New(collection string) *Policy {
// It should not be changed concurrently with log writes. // It should not be changed concurrently with log writes.
func (p *Policy) SetVerbosityLevel(level int) { func (p *Policy) SetVerbosityLevel(level int) {
p.Logtail.SetVerbosityLevel(level) p.Logtail.SetVerbosityLevel(level)
if level > 0 {
dialLog.SetOutput(os.Stderr)
}
} }
// Close immediately shuts down the logger. // Close immediately shuts down the logger.
@ -624,7 +637,7 @@ func NewLogtailTransport(host string) *http.Transport {
c, err := nd.DialContext(ctx, netw, addr) c, err := nd.DialContext(ctx, netw, addr)
d := time.Since(t0).Round(time.Millisecond) d := time.Since(t0).Round(time.Millisecond)
if err == nil { if err == nil {
log.Printf("logtail: dialed %q in %v", addr, d) dialLog.Printf("dialed %q in %v", addr, d)
return c, nil return c, nil
} }
@ -637,10 +650,10 @@ func NewLogtailTransport(host string) *http.Transport {
err = errors.New(res.Status) err = errors.New(res.Status)
} }
if err != nil { if err != nil {
log.Printf("logtail: CONNECT response from tailscaled: %v", err) log.Printf("logtail: CONNECT response error from tailscaled: %v", err)
c.Close() c.Close()
} else { } else {
log.Printf("logtail: connected via tailscaled") dialLog.Printf("connected via tailscaled")
return c, nil return c, nil
} }
} }

4
wgengine/magicsock/magicsock.go
View File

@ -2111,12 +2111,12 @@ func (c *Conn) enqueueCallMeMaybe(derpAddr netaddr.IPPort, de *endpoint) {
defer c.mu.Unlock() defer c.mu.Unlock()
if !c.lastEndpointsTime.After(time.Now().Add(-endpointsFreshEnoughDuration)) { if !c.lastEndpointsTime.After(time.Now().Add(-endpointsFreshEnoughDuration)) {
c.logf("magicsock: want call-me-maybe but endpoints stale; restunning") c.logf("[v1] magicsock: want call-me-maybe but endpoints stale; restunning")
if c.onEndpointRefreshed == nil { if c.onEndpointRefreshed == nil {
c.onEndpointRefreshed = map[*endpoint]func(){} c.onEndpointRefreshed = map[*endpoint]func(){}
} }
c.onEndpointRefreshed[de] = func() { c.onEndpointRefreshed[de] = func() {
c.logf("magicsock: STUN done; sending call-me-maybe to %v %v", de.discoShort, de.publicKey.ShortString()) c.logf("[v1] magicsock: STUN done; sending call-me-maybe to %v %v", de.discoShort, de.publicKey.ShortString())
c.enqueueCallMeMaybe(derpAddr, de) c.enqueueCallMeMaybe(derpAddr, de)
} }
// TODO(bradfitz): make a new 'reSTUNQuickly' method // TODO(bradfitz): make a new 'reSTUNQuickly' method