summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBrad Fitzpatrick <brad@danga.com>2020-03-13 09:42:09 -0700
committerBrad Fitzpatrick <brad@danga.com>2020-03-13 09:42:09 -0700
commit42e98d4edc2909fbb625916e9bffe451ce0bbb4f (patch)
tree25b8aaaa3c76c3db9f1633ed2bff40dca3e37369
parentdb2436c7ff4c5ea8a1bab229d08bb4e2f8ba3f9e (diff)
downloadtailscale-42e98d4edc2909fbb625916e9bffe451ce0bbb4f.tar.xz
tailscale-42e98d4edc2909fbb625916e9bffe451ce0bbb4f.zip
Quiet two little log annoyances.
-rw-r--r--ipn/local.go6
-rw-r--r--netcheck/netcheck.go2
2 files changed, 6 insertions, 2 deletions
diff --git a/ipn/local.go b/ipn/local.go
index b5daece23..40e9943e6 100644
--- a/ipn/local.go
+++ b/ipn/local.go
@@ -215,7 +215,11 @@ func (b *LocalBackend) Start(opts Options) error {
b.mu.Lock()
if b.netMapCache != nil {
diff := newSt.NetMap.ConciseDiffFrom(b.netMapCache)
- b.logf("netmap diff:\n%v\n", diff)
+ if strings.TrimSpace(diff) == "" {
+ b.logf("netmap diff: (none)")
+ } else {
+ b.logf("netmap diff:\n%v\n", diff)
+ }
}
b.netMapCache = newSt.NetMap
b.mu.Unlock()
diff --git a/netcheck/netcheck.go b/netcheck/netcheck.go
index 067173b98..9e2ea7880 100644
--- a/netcheck/netcheck.go
+++ b/netcheck/netcheck.go
@@ -233,7 +233,7 @@ func (c *Client) GetReport(ctx context.Context) (*Report, error) {
return gotEP4 != ""
}
add := func(server, ipPort string, d time.Duration) {
- c.logf("%s says we are %s (in %v)", server, ipPort, d)
+ c.logf("%s says we are %s (in %v)", server, ipPort, d.Round(time.Millisecond))
ua, err := net.ResolveUDPAddr("udp", ipPort)
if err != nil {