cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 18:41:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2610 from calmh/fix2608-2

Browse Source 
Correctly set default logfile location on Windows (fixes #2608)
This commit is contained in:
Jakob Borg 2015-12-21 12:26:49 +01:00
commit 435afa0eea
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/syncthing/main.go
View File

@ -222,7 +222,6 @@ func defaultRuntimeOptions() RuntimeOptions {
assetDir: os.Getenv("STGUIASSETS"),
cpuProfile: os.Getenv("STCPUPROFILE") != "",
stRestarting: os.Getenv("STRESTART") != "",
logFile: "-", // Output to stdout
logFlags: log.Ltime,
}
@ -234,8 +233,12 @@ func defaultRuntimeOptions() RuntimeOptions {
options.logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
}
if runtime.GOOS == "windows" {
options.logFile = locations[locLogFile]
if runtime.GOOS != "windows" {
// On non-Windows, we explicitly default to "-" which means stdout. On
// Windows, the blank options.logFile will later be replaced with the
// default path, unless the user has manually specified "-" or
// something else.
options.logFile = "-"
}
return options
@ -299,6 +302,12 @@ func main() {
l.Fatalln(err)
}
if options.logFile == "" {
// Blank means use the default logfile location. We must set this
// *after* expandLocations above.
options.logFile = locations[locLogFile]
}
if options.showVersion {
fmt.Println(LongVersion)
return