Merge branch 'develop' into style/imports-fmt

tydhot · Aug 1, 2021 · 14f3fc2 · 14f3fc2
2 parents 64514d3 + 64a1e21
commit 14f3fc2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/cmd/pixiu/control.go b/cmd/pixiu/control.go
@@ -83,11 +83,15 @@ var (
 			flagLogLevel := c.String("log-level")
 			logConfPath := c.String("log-config")
 
+			err := logger.InitLog(logConfPath)
+			if err != nil {
+				return err
+			}
+
 			bootstrap := config.Load(configPath)
 			if logLevel, ok := flagToLogLevel[flagLogLevel]; ok {
 				logger.SetLoggerLevel(logLevel)
 			}
-			logger.InitLog(logConfPath)
 
 			initFromRemote := false
 			if bootstrap.GetAPIMetaConfig() != nil {

diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -59,10 +59,13 @@ type Logger interface {
 }
 
 func init() {
-	logConfFile := "./conf/log.yml"
-	err := InitLog(logConfFile)
-	if err != nil {
-		logger.Infof("[InitLog] warn: %v", err)
+	// TODO: Reserve for testing, using a better way?
+	if logger == nil {
+		logConfFile := "./conf/log.yml"
+		err := InitLog(logConfFile)
+		if err != nil {
+			logger.Infof("[InitLog] warn: %v", err)
+		}
 	}
 }