From 7119424e32c9d080762b1f4fa923c6c89ffd0bd0 Mon Sep 17 00:00:00 2001 From: Andrea Gottardo Date: Fri, 19 Apr 2024 09:00:22 -0700 Subject: [PATCH] libtailscale: don't log syspolicy.ErrNoSuchKey (#348) There is no value in logging when syspolicy.ErrNoSuchKey is returning from the syspolicy handler, so we just shouldn't. The `failed to get string value` error message was very likely to lead to confusion over its meaning. Signed-off-by: Andrea Gottardo --- libtailscale/syspolicy_handler.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libtailscale/syspolicy_handler.go b/libtailscale/syspolicy_handler.go index b7261b1..b5ba3ad 100644 --- a/libtailscale/syspolicy_handler.go +++ b/libtailscale/syspolicy_handler.go @@ -4,6 +4,7 @@ package libtailscale import ( + "errors" "log" "tailscale.com/util/syspolicy" @@ -20,7 +21,7 @@ func (h syspolicyHandler) ReadString(key string) (string, error) { return "", syspolicy.ErrNoSuchKey } retVal, err := h.a.appCtx.GetSyspolicyStringValue(key) - if err != nil { + if err != nil && !errors.Is(err, syspolicy.ErrNoSuchKey) { log.Printf("syspolicy: failed to get string value via gomobile: %v", err) } return retVal, err @@ -31,7 +32,7 @@ func (h syspolicyHandler) ReadBoolean(key string) (bool, error) { return false, syspolicy.ErrNoSuchKey } retVal, err := h.a.appCtx.GetSyspolicyBooleanValue(key) - if err != nil { + if err != nil && !errors.Is(err, syspolicy.ErrNoSuchKey) { log.Printf("syspolicy: failed to get bool value via gomobile: %v", err) } return retVal, err