From d63e54237bcd0cf99c71c346b45ea63d6bd3053a Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Thu, 27 Aug 2015 18:19:06 +0200
Subject: [PATCH] Allow -logfile on all platforms (fixes #2004)

---
 cmd/syncthing/main.go    | 14 +++++---------
 cmd/syncthing/monitor.go |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 67ad2706..80d89315 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -218,11 +218,12 @@ func main() {
 	if runtime.GOOS == "windows" {
 		// On Windows, we use a log file by default. Setting the -logfile flag
 		// to "-" disables this behavior.
-
 		flag.StringVar(&logFile, "logfile", "", "Log file name (use \"-\" for stdout)")
 
 		// We also add an option to hide the console window
 		flag.BoolVar(&noConsole, "no-console", false, "Hide console window")
+	} else {
+		flag.StringVar(&logFile, "logfile", "-", "Log file name (use \"-\" for stdout)")
 	}
 
 	flag.StringVar(&generateDir, "generate", "", "Generate key and config in specified dir, then exit")
@@ -262,14 +263,9 @@ func main() {
 		guiAssets = locations[locGUIAssets]
 	}
 
-	if runtime.GOOS == "windows" {
-		if logFile == "" {
-			// Use the default log file location
-			logFile = locations[locLogFile]
-		} else if logFile == "-" {
-			// Don't use a logFile
-			logFile = ""
-		}
+	if logFile == "" {
+		// Use the default log file location
+		logFile = locations[locLogFile]
 	}
 
 	if showVersion {
diff --git a/cmd/syncthing/monitor.go b/cmd/syncthing/monitor.go
index a5ff1c30..955e2bfe 100644
--- a/cmd/syncthing/monitor.go
+++ b/cmd/syncthing/monitor.go
@@ -40,7 +40,7 @@ func monitorMain() {
 	var err error
 	var dst io.Writer = os.Stdout
 
-	if logFile != "" {
+	if logFile != "-" {
 		var fileDst io.Writer
 
 		fileDst, err = os.Create(logFile)