From 0653efb092be5fec2daa723231e4de1a31ccf4b0 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 18 Nov 2021 10:13:21 -0800 Subject: [PATCH] cmd/tailscaled: remove a redundant date prefix on Windows logs Change-Id: I28e122d4384697f51a748d67829409276c00b11e Signed-off-by: Brad Fitzpatrick --- cmd/tailscaled/tailscaled_windows.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/tailscaled/tailscaled_windows.go b/cmd/tailscaled/tailscaled_windows.go index f7465caeb..a6c9f8c04 100644 --- a/cmd/tailscaled/tailscaled_windows.go +++ b/cmd/tailscaled/tailscaled_windows.go @@ -75,7 +75,11 @@ func (service *ipnService) Execute(args []string, r <-chan svc.ChangeRequest, ch go func() { defer close(doneCh) args := []string{"/subproc", service.Policy.PublicID.String()} - ipnserver.BabysitProc(ctx, args, log.Printf) + // 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) + ipnserver.BabysitProc(ctx, args, logger.Printf) }() changes <- svc.Status{State: svc.Running, Accepts: svcAccepts}