mirror of
https://github.com/tailscale/tailscale.git
synced 2026-11-21 20:22:41 +09:00
ipn/ipnlocal: skip log directory lookup when logtail is omitted
Avoid a startup panic when no log directory is available and the sockstat logger is disabled by ts_omit_logtail. Fixes #22246 Change-Id: I06efea76cdaf6cda4b454dbede8cf2e69bbd588d Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
This commit is contained in:
1 parent
48f559c113
commit
62d055f4c3
1 file changed
+5
-3
@@ -681,9 +681,11 @@ func NewLocalBackend(logf logger.Logf, logID logid.PublicID, sys *tsd.System, lo
|
||||
}
|
||||
|
||||
netMon := sys.NetMon.Get()
|
||||
b.sockstatLogger, err = sockstatlog.NewLogger(logpolicy.LogsDir(logf), logf, logID, netMon, sys.HealthTracker.Get(), sys.Bus.Get())
|
||||
if err != nil {
|
||||
logf("error setting up sockstat logger: %v", err)
|
||||
if buildfeatures.HasLogTail {
|
||||
b.sockstatLogger, err = sockstatlog.NewLogger(logpolicy.LogsDir(logf), logf, logID, netMon, sys.HealthTracker.Get(), sys.Bus.Get())
|
||||
if err != nil {
|
||||
logf("error setting up sockstat logger: %v", err)
|
||||
}
|
||||
}
|
||||
// Enable sockstats logs only on non-mobile unstable builds
|
||||
if version.IsUnstableBuild() && !version.IsMobile() && b.sockstatLogger != nil {
|
||||
|
||||
Reference in new issue
Block a user