Merge pull request #1694 from ibuildthecloud/inittwice

Allow InitLogging to be called twice

pkg/cli/cmds/log.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/docker/docker/pkg/reexec"
@@ -43,19 +44,26 @@ var (
 		Usage:       "(logging) Log to standard error as well as file (if set)",
 		Destination: &LogConfig.AlsoLogToStderr,
 	}
+
+	logSetupOnce sync.Once
 )
 
 func InitLogging() error {
-	if LogConfig.LogFile != "" && os.Getenv("_K3S_LOG_REEXEC_") == "" {
+	var rErr error
-		return runWithLogging()
+	logSetupOnce.Do(func() {
-	}
+		if LogConfig.LogFile != "" && os.Getenv("_K3S_LOG_REEXEC_") == "" {
+			rErr = runWithLogging()
+			return
+		}
 
-	if err := checkUnixTimestamp(); err != nil {
+		if err := checkUnixTimestamp(); err != nil {
-		return err
+			rErr = err
-	}
+			return
+		}
 
-	setupLogging()
+		setupLogging()
-	return nil
+	})
+	return rErr
 }
 
 func checkUnixTimestamp() error {