perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd/syncthing: Fail if -logfile and -no-restart passed together (fixes #3912)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3915
This commit is contained in:
Antony Male 2017-01-18 12:19:22 +00:00 committed by Jakob Borg
parent bd1c29ee32
commit 4c8aa14e07
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/syncthing/main.go
View File

@ -320,6 +320,12 @@ func main() {
os.Setenv("STGUIAPIKEY", options.guiAPIKey) os.Setenv("STGUIAPIKEY", options.guiAPIKey)
} }
// Check for options which are not compatible with each other
// Have to check logfile before it's set to the default below - we only want to complain if they set -logfile explicitly, not if it's set to its default location
if options.noRestart && options.logFile != "" {
l.Fatalln("-logfile may not be used with -no-restart or STNORESTART")
}
if options.hideConsole { if options.hideConsole {
osutil.HideConsole() osutil.HideConsole()
} }