From 7211e6db1b8322a259b96178ccd9b711c6cf7426 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 25 Jul 2020 12:45:16 +0200 Subject: [PATCH] cmd/tailscale: tee log output to both Tailscale and the Android log Updates tailscale/tailscale#471 Signed-off-by: Elias Naur --- cmd/tailscale/backend.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go index b295fa8..b73835c 100644 --- a/cmd/tailscale/backend.go +++ b/cmd/tailscale/backend.go @@ -7,6 +7,7 @@ package main import ( "errors" "fmt" + "io" "log" "path/filepath" "reflect" @@ -301,7 +302,10 @@ func (b *backend) SetupLogs(logDir string, logID logtail.PrivateID) { b.logger = logtail.Log(logcfg, logf) log.SetFlags(0) - log.SetOutput(b.logger) + log.SetOutput(io.MultiWriter( + log.Writer(), + b.logger, + )) log.Printf("goSetupLogs: success")