From 5a3da3cd7fa10308799d021cd3c25a22340696fb Mon Sep 17 00:00:00 2001 From: Will Norris Date: Mon, 3 Apr 2023 14:21:48 -0700 Subject: [PATCH] ipn: add sockstat logger to stable builds This makes the sockstat logger available on all builds, but only enables it by default for unstable. For stable builds, the logger must be explicitly enabled via C2N component logger. Updates tailscale/corp#9230 Updates #3363 Signed-off-by: Will Norris --- ipn/ipnlocal/local.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 902a15458..8114e098f 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -313,15 +313,13 @@ func NewLocalBackend(logf logger.Logf, logID logid.PublicID, store ipn.StateStor loginFlags: loginFlags, } - // for now, only log sockstats on unstable builds - if version.IsUnstableBuild() { - b.sockstatLogger, err = sockstatlog.NewLogger(logpolicy.LogsDir(logf), logf, logID) - if err != nil { - log.Printf("error setting up sockstat logger: %v", err) - } - if b.sockstatLogger != nil { - b.sockstatLogger.SetLoggingEnabled(true) - } + b.sockstatLogger, err = sockstatlog.NewLogger(logpolicy.LogsDir(logf), logf, logID) + if err != nil { + log.Printf("error setting up sockstat logger: %v", err) + } + // Enable sockstats logs only on unstable builds + if version.IsUnstableBuild() && b.sockstatLogger != nil { + b.sockstatLogger.SetLoggingEnabled(true) } // Default filter blocks everything and logs nothing, until Start() is called.