Add --syslog flag to optionally log to syslog on capable platforms

cmd/cmd.go

@@ -31,7 +31,6 @@ var (
 	statsInterval = fs.DurationP("stats", "", time.Minute*1, "Interval between printing stats, e.g 500ms, 60s, 5m. (0 to disable)")
 	dataRateUnit  = fs.StringP("stats-unit", "", "bytes", "Show data rate in stats as either 'bits' or 'bytes'/s")
 	version       bool
-	logFile       = fs.StringP("log-file", "", "", "Log everything to this file")
 	retries       = fs.IntP("retries", "", 3, "Retry operations this many times if they fail")
 )
 
@@ -320,20 +319,8 @@ func StartStats() chan struct{} {
 
 // initConfig is run by cobra after initialising the flags
 func initConfig() {
-	// Log file output
-	if *logFile != "" {
-		f, err := os.OpenFile(*logFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0640)
-		if err != nil {
-			log.Fatalf("Failed to open log file: %v", err)
-		}
-		_, err = f.Seek(0, os.SEEK_END)
-		if err != nil {
-			fs.Errorf(nil, "Failed to seek log file to end: %v", err)
-		}
-		log.SetOutput(f)
-		fs.DebugLogger.SetOutput(f)
-		redirectStderr(f)
-	}
+	// Start the logger
+	fs.InitLogging()
 
 	// Load the rest of the config now we have started the logger
 	fs.LoadConfig()

cmd/redirect_stderr.go

@@ -1,16 +0,0 @@
-// Log the panic to the log file - for oses which can't do this
-
-// +build !windows,!darwin,!dragonfly,!freebsd,!linux,!nacl,!netbsd,!openbsd
-
-package cmd
-
-import (
-	"os"
-
-	"github.com/ncw/rclone/fs"
-)
-
-// redirectStderr to the file passed in
-func redirectStderr(f *os.File) {
-	fs.Errorf(nil, "Can't redirect stderr to file")
-}

cmd/redirect_stderr_unix.go

@@ -1,20 +0,0 @@
-// Log the panic under unix to the log file
-
-// +build !windows,!solaris,!plan9
-
-package cmd
-
-import (
-	"log"
-	"os"
-
-	"golang.org/x/sys/unix"
-)
-
-// redirectStderr to the file passed in
-func redirectStderr(f *os.File) {
-	err := unix.Dup2(int(f.Fd()), int(os.Stderr.Fd()))
-	if err != nil {
-		log.Fatalf("Failed to redirect stderr to file: %v", err)
-	}
-}

cmd/redirect_stderr_windows.go

@@ -1,39 +0,0 @@
-// Log the panic under windows to the log file
-//
-// Code from minix, via
-//
-// http://play.golang.org/p/kLtct7lSUg
-
-// +build windows
-
-package cmd
-
-import (
-	"log"
-	"os"
-	"syscall"
-)
-
-var (
-	kernel32         = syscall.MustLoadDLL("kernel32.dll")
-	procSetStdHandle = kernel32.MustFindProc("SetStdHandle")
-)
-
-func setStdHandle(stdhandle int32, handle syscall.Handle) error {
-	r0, _, e1 := syscall.Syscall(procSetStdHandle.Addr(), 2, uintptr(stdhandle), uintptr(handle), 0)
-	if r0 == 0 {
-		if e1 != 0 {
-			return error(e1)
-		}
-		return syscall.EINVAL
-	}
-	return nil
-}
-
-// redirectStderr to the file passed in
-func redirectStderr(f *os.File) {
-	err := setStdHandle(syscall.STD_ERROR_HANDLE, syscall.Handle(f.Fd()))
-	if err != nil {
-		log.Fatalf("Failed to redirect stderr to file: %v", err)
-	}
-}