mirror of
https://github.com/tailscale/tailscale.git
synced 2025-03-30 21:12:48 +00:00
wgengine/netlog: fix nil pointer dereference in logtail (#8598)
This commit is contained in:
parent
4f95b6966b
commit
354885a08d
@ -101,7 +101,8 @@ func (nl *Logger) Startup(nodeID tailcfg.StableNodeID, nodeLogID, domainLogID lo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Startup a log stream to Tailscale's logging service.
|
// Startup a log stream to Tailscale's logging service.
|
||||||
httpc := &http.Client{Transport: logpolicy.NewLogtailTransport(logtail.DefaultHost, netMon, nl.logger.Logf)}
|
logf := log.Printf
|
||||||
|
httpc := &http.Client{Transport: logpolicy.NewLogtailTransport(logtail.DefaultHost, netMon, logf)}
|
||||||
if testClient != nil {
|
if testClient != nil {
|
||||||
httpc = testClient
|
httpc = testClient
|
||||||
}
|
}
|
||||||
@ -123,7 +124,7 @@ func (nl *Logger) Startup(nodeID tailcfg.StableNodeID, nodeLogID, domainLogID lo
|
|||||||
// Include process sequence numbers to identify missing samples.
|
// Include process sequence numbers to identify missing samples.
|
||||||
IncludeProcID: true,
|
IncludeProcID: true,
|
||||||
IncludeProcSequence: true,
|
IncludeProcSequence: true,
|
||||||
}, log.Printf)
|
}, logf)
|
||||||
nl.logger.SetSockstatsLabel(sockstats.LabelNetlogLogger)
|
nl.logger.SetSockstatsLabel(sockstats.LabelNetlogLogger)
|
||||||
|
|
||||||
// Startup a data structure to track per-connection statistics.
|
// Startup a data structure to track per-connection statistics.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user