mirror of
https://github.com/tailscale/tailscale.git
synced 2025-04-24 01:41:42 +00:00
wgengine: respect --no-logs-no-support flag for network logging (#6172)
In the future this will cause a node to be unable to join the tailnet if network logging is enabled. Signed-off-by: Joe Tsai <joetsai@digital-static.net>
This commit is contained in:
parent
910db02652
commit
7d6775b082
@ -887,6 +887,9 @@ func (e *userspaceEngine) Reconfig(cfg *wgcfg.Config, routerCfg *router.Config,
|
|||||||
netLogIDsWasValid := !oldLogIDs.NodeID.IsZero() && !oldLogIDs.DomainID.IsZero()
|
netLogIDsWasValid := !oldLogIDs.NodeID.IsZero() && !oldLogIDs.DomainID.IsZero()
|
||||||
netLogIDsChanged := netLogIDsNowValid && netLogIDsWasValid && newLogIDs != oldLogIDs
|
netLogIDsChanged := netLogIDsNowValid && netLogIDsWasValid && newLogIDs != oldLogIDs
|
||||||
netLogRunning := netLogIDsNowValid && !routerCfg.Equal(&router.Config{})
|
netLogRunning := netLogIDsNowValid && !routerCfg.Equal(&router.Config{})
|
||||||
|
if envknob.NoLogsNoSupport() {
|
||||||
|
netLogRunning = false
|
||||||
|
}
|
||||||
|
|
||||||
// TODO(bradfitz,danderson): maybe delete this isDNSIPOverTailscale
|
// TODO(bradfitz,danderson): maybe delete this isDNSIPOverTailscale
|
||||||
// field and delete the resolver.ForwardLinkSelector hook and
|
// field and delete the resolver.ForwardLinkSelector hook and
|
||||||
|
Loading…
x
Reference in New Issue
Block a user