Db/fix logpath again (#291)

derekwbrown · Sami Tabet · commit 9496f1d750cd · 2019-04-10T16:25:08.000-04:00
* Make changes to various paths to reflect changes in
`datadog-agent`library for finding the programdatadir()

* Fix log file location (again).
Remove printf debugging that was left in there before
diff --git a/cmd/agent/main_windows.go b/cmd/agent/main_windows.go
@@ -35,12 +35,11 @@ var winopts struct {
 }
 
 func init() {
-	fmt.Printf("main_windows.init()")
 	pd, err := winutil.GetProgramDataDir()
 	if err == nil {
 		defaultConfigPath = filepath.Join(pd, "datadog.yaml")
 		defaultConfdPath = filepath.Join(pd, "conf.d")
-		defaultLogFilePath = filepath.Join(pd, "logs", "process.log")
+		defaultLogFilePath = filepath.Join(pd, "logs", "process-agent.log")
 	}
 }
 
diff --git a/config/config_windows.go b/config/config_windows.go
@@ -18,7 +18,7 @@ var (
 
 func init() {
 	if pd, err := winutil.GetProgramDataDir(); err == nil {
-		defaultLogFilePath = filepath.Join(pd, "Datadog", "logs", "process-agent.log")
+		defaultLogFilePath = filepath.Join(pd, "logs", "process-agent.log")
 	}
 	if _here, err := executable.Folder(); err == nil {
 		defaultDDAgentBin = filepath.Join(_here, "..", "..", "embedded", "agent.exe")

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,11 @@ var winopts struct {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func init() {`
`38`		`- fmt.Printf("main_windows.init()")`
`39`	`38`	`pd, err := winutil.GetProgramDataDir()`
`40`	`39`	`if err == nil {`
`41`	`40`	`defaultConfigPath = filepath.Join(pd, "datadog.yaml")`
`42`	`41`	`defaultConfdPath = filepath.Join(pd, "conf.d")`
`43`		`- defaultLogFilePath = filepath.Join(pd, "logs", "process.log")`
	`42`	`+ defaultLogFilePath = filepath.Join(pd, "logs", "process-agent.log")`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ var (`
`18`	`18`
`19`	`19`	`func init() {`
`20`	`20`	`if pd, err := winutil.GetProgramDataDir(); err == nil {`
`21`		`- defaultLogFilePath = filepath.Join(pd, "Datadog", "logs", "process-agent.log")`
	`21`	`+ defaultLogFilePath = filepath.Join(pd, "logs", "process-agent.log")`
`22`	`22`	`}`
`23`	`23`	`if _here, err := executable.Folder(); err == nil {`
`24`	`24`	`defaultDDAgentBin = filepath.Join(_here, "..", "..", "embedded", "agent.exe")`