TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-18 12:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscaled: don't create a network monitor in the parent tailscaled on Windows

Browse Source 
The service is only used as a watchdog and for piping logs from the child
process. We shouldn't be creating a network monitor in that case.

Fixes #10732

Signed-off-by: Aaron Klotz <aaron@tailscale.com>
This commit is contained in:
Aaron Klotz 2024-01-03 12:45:49 -07:00
parent fa3639783c
commit e32a064659
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/tailscaled/tailscaled.go
View File

@ -324,7 +324,7 @@ func ipnServerOpts() (o serverOptions) {
var logPol *logpolicy.Policy var logPol *logpolicy.Policy
var debugMux *http.ServeMux var debugMux *http.ServeMux
func run() error { func run() (err error) {
var logf logger.Logf = log.Printf var logf logger.Logf = log.Printf
sys := new(tsd.System) sys := new(tsd.System)
@ -332,7 +332,6 @@ func run() error {
// Parse config, if specified, to fail early if it's invalid. // Parse config, if specified, to fail early if it's invalid.
var conf *conffile.Config var conf *conffile.Config
if args.confFile != "" { if args.confFile != "" {
var err error
conf, err = conffile.Load(args.confFile) conf, err = conffile.Load(args.confFile)
if err != nil { if err != nil {
return fmt.Errorf("error reading config file: %w", err) return fmt.Errorf("error reading config file: %w", err)
@ -340,13 +339,17 @@ func run() error {
sys.InitialConfig = conf sys.InitialConfig = conf
} }
netMon, err := netmon.New(func(format string, args ...any) { var netMon *netmon.Monitor
logf(format, args...) isWinSvc := isWindowsService()
}) if !isWinSvc {
if err != nil { netMon, err = netmon.New(func(format string, args ...any) {
return fmt.Errorf("netmon.New: %w", err) logf(format, args...)
})
if err != nil {
return fmt.Errorf("netmon.New: %w", err)
}
sys.Set(netMon)
} }
sys.Set(netMon)
pol := logpolicy.New(logtail.CollectionNode, netMon, nil /* use log.Printf */) pol := logpolicy.New(logtail.CollectionNode, netMon, nil /* use log.Printf */)
pol.SetVerbosityLevel(args.verbose) pol.SetVerbosityLevel(args.verbose)
@ -362,7 +365,7 @@ func run() error {
log.Printf("Error reading environment config: %v", err) log.Printf("Error reading environment config: %v", err)
} }
if isWindowsService() { if isWinSvc {
// Run the IPN server from the Windows service manager. // Run the IPN server from the Windows service manager.
log.Printf("Running service...") log.Printf("Running service...")
if err := runWindowsService(pol); err != nil { if err := runWindowsService(pol); err != nil {