From 651c4899ac90faa365e5b38e55bbb997bcbf5d75 Mon Sep 17 00:00:00 2001 From: James Tucker Date: Fri, 23 Feb 2024 16:05:57 -0800 Subject: [PATCH] net/interfaces: reduce & cleanup logs on iOS We don't need a log line every time defaultRoute is read in the good case, and we now only log default interface updates that are actually changes. Updates #3363 Signed-off-by: James Tucker --- net/interfaces/defaultroute_ios.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/interfaces/defaultroute_ios.go b/net/interfaces/defaultroute_ios.go index 2a1c5324c..f8011253b 100644 --- a/net/interfaces/defaultroute_ios.go +++ b/net/interfaces/defaultroute_ios.go @@ -21,8 +21,9 @@ func UpdateLastKnownDefaultRouteInterface(ifName string) { if ifName == "" { return } - lastKnownDefaultRouteIfName.Store(ifName) - log.Printf("defaultroute_ios: update from Swift, ifName = %s", ifName) + if old := lastKnownDefaultRouteIfName.Swap(ifName); old != ifName { + log.Printf("defaultroute_ios: update from Swift, ifName = %s (was %s)", ifName, old) + } } func defaultRoute() (d DefaultRouteDetails, err error) { @@ -56,13 +57,13 @@ func defaultRoute() (d DefaultRouteDetails, err error) { } if !ifc.IsUp() { - log.Println("defaultroute_ios: %s is down", name) + log.Printf("defaultroute_ios: %s is down", name) return nil } addrs, _ := ifc.Addrs() if len(addrs) == 0 { - log.Println("defaultroute_ios: %s has no addresses", name) + log.Printf("defaultroute_ios: %s has no addresses", name) return nil } return &ifc @@ -76,7 +77,6 @@ func defaultRoute() (d DefaultRouteDetails, err error) { if swiftIfName := lastKnownDefaultRouteIfName.Load(); swiftIfName != "" { ifc := getInterfaceByName(swiftIfName) if ifc != nil { - log.Printf("defaultroute_ios: using %s (provided by Swift)", ifc.Name) d.InterfaceName = ifc.Name d.InterfaceIndex = ifc.Index return d, nil