use single function that does platform specific things

log/log.go

@@ -12,7 +12,7 @@ type Logger struct {
 }
 
 var (
-	Log *Logger
+	Log  *Logger
 	path string
 )
 
@@ -22,7 +22,7 @@ func Open(name, logLevelStr string, prio syslog.Priority) *Logger {
 		log.Fatal("Invalid log level specified")
 	}
 
-	Log = &Logger { logging.MustGetLogger(name) }
+	Log = &Logger{logging.MustGetLogger(name)}
 
 	var formatStdout = logging.MustStringFormatter(
 		"%{color}%{time:2006-01-02T15:04:05.000} %{shortfunc} ▶ %{level:.4s} %{color:reset} %{message}",
@@ -51,4 +51,18 @@ func Reopen() {
 	Log.Notice("Reopened log file per IPC request")
 }
 
+// If there are any existing fd's (e.g. we're reopening logs), we rely
+// on garbage collection to clean them up for us.
+func LogRedirectStdOutToFile(logPath string) {
+	path = logPath
+	if logPath == "" {
+		Log.Fatal("Log Path not set")
+	}
 
+	logFile, err := os.OpenFile(logPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
+	if err != nil {
+		Log.Fatal(err)
+	}
+
+	stdFdToLogFile(int(logFile.Fd()))
+}

log/log_redirect.go

@@ -2,24 +2,9 @@
 
 package log
 
-import (
+import "syscall"
-	"os"
-	"syscall"
-)
 
-// If there are any existing fd's (e.g. we're reopening logs), we rely
+func stdFdToLogFile(logFileFd int) {
-// on garbage collection to clean them up for us.
+	syscall.Dup2(logFileFd, 1)
-func LogRedirectStdOutToFile(logPath string) {
+	syscall.Dup2(logFileFd, 2)
-	path = logPath
-	if logPath == "" {
-		Log.Fatal("Log Path not set")
-	}
-
-	logFile, err := os.OpenFile(logPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
-	if err != nil {
-		Log.Fatal(err)
-	}
-
-	syscall.Dup2(int(logFile.Fd()), 1)
-	syscall.Dup2(int(logFile.Fd()), 2)
 }

log/log_redirect_arm64.go

@@ -1,23 +1,8 @@
 package log
 
-import (
+import "syscall"
-	"os"
-	"syscall"
-)
 
-// If there are any existing fd's (e.g. we're reopening logs), we rely
+func stdFdToLogFile(logFileFd int) {
-// on garbage collection to clean them up for us.
+	syscall.Dup3(logFileFd, 1, 0)
-func LogRedirectStdOutToFile(logPath string) {
+	syscall.Dup3(logFileFd, 2, 0)
-	path = logPath
-	if logPath == "" {
-		Log.Fatal("Log Path not set")
-	}
-
-	logFile, err := os.OpenFile(logPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
-	if err != nil {
-		Log.Fatal(err)
-	}
-
-	syscall.Dup3(int(logFile.Fd()), 1, 0)
-	syscall.Dup3(int(logFile.Fd()), 2, 0)
 }