From 98f9e82c62aa999b360c416ff6768bd89a277290 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Fri, 5 Feb 2021 10:53:15 -0800
Subject: [PATCH] logpolicy: on Windows, use tailscale-ipn log name if it
 already existed

For the migration to tailscaled.exe on Windows, don't create a new logid
if one existed under the old filename.

Updates #1232
---
 logpolicy/logpolicy.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/logpolicy/logpolicy.go b/logpolicy/logpolicy.go
index 12032e022..add1874a6 100644
--- a/logpolicy/logpolicy.go
+++ b/logpolicy/logpolicy.go
@@ -339,6 +339,18 @@ func New(collection string) *Policy {
 	tryFixLogStateLocation(dir, cmdName)
 
 	cfgPath := filepath.Join(dir, fmt.Sprintf("%s.log.conf", cmdName))
+
+	// The Windows service previously ran as tailscale-ipn.exe, so
+	// let's keep using that log base name if it exists.
+	if runtime.GOOS == "windows" && cmdName == "tailscaled" {
+		const oldCmdName = "tailscale-ipn"
+		oldPath := filepath.Join(dir, oldCmdName+".log.conf")
+		if fi, err := os.Stat(oldPath); err == nil && fi.Mode().IsRegular() {
+			cfgPath = oldPath
+			cmdName = oldCmdName
+		}
+	}
+
 	var oldc *Config
 	data, err := ioutil.ReadFile(cfgPath)
 	if err != nil {