From e67182d44606d05ede8400514fa28b0bc7211f91 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 14 Dec 2021 14:30:05 -0800 Subject: [PATCH] cmd/tailscaled: fix windows logtail integration I broke it in 1.17.x sometime while rewiring some logs stuff, mostly in 0653efb092be5fec2daa723231e4de1a31ccf4b0 (but with a handful of logs-related changes around that time) Fixes tailscale/corp#3265 Change-Id: Icb5c07412dc6d55f1d9244c5d0b51dceca6a7e34 Signed-off-by: Brad Fitzpatrick (cherry picked from commit 59f4f33f60e85db7cbbd9cbe84940e858ed9751a) --- cmd/tailscaled/tailscaled_windows.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/tailscaled/tailscaled_windows.go b/cmd/tailscaled/tailscaled_windows.go index a6c9f8c04..037712dbf 100644 --- a/cmd/tailscaled/tailscaled_windows.go +++ b/cmd/tailscaled/tailscaled_windows.go @@ -78,7 +78,10 @@ func (service *ipnService) Execute(args []string, r <-chan svc.ChangeRequest, ch // Make a logger without a date prefix, as filelogger // and logtail both already add their own. All we really want // from the log package is the automatic newline. - logger := log.New(os.Stderr, "", 0) + // We start with log.Default().Writer(), which is the logtail + // writer that logpolicy already installed as the global + // output. + logger := log.New(log.Default().Writer(), "", 0) ipnserver.BabysitProc(ctx, args, logger.Printf) }() @@ -114,6 +117,9 @@ func beWindowsSubprocess() bool { } logid := os.Args[2] + // Remove the date/time prefix; the logtail + file logggers add it. + log.SetFlags(0) + log.Printf("Program starting: v%v: %#v", version.Long, os.Args) log.Printf("subproc mode: logid=%v", logid)