Merge pull request #508 from jumpserver/dev

perf: 配置加载顺序调整 (#507)
jumpserver · Dec 11, 2020 · ee146e1 · ee146e1
2 parents 637a41d + 027f4e1
commit ee146e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -143,11 +143,14 @@ func (c *Config) LoadFromEnv() error {
 }
 
 func (c *Config) Load(filepath string) error {
-	if err := c.LoadFromYAMLPath(filepath); err == nil {
-		return err
+	var err error
+	log.Print("Config Load from env first")
+	_ = c.LoadFromEnv()
+	if _, err = os.Stat(filepath); err == nil {
+		log.Printf("Config reload from file: %s", filepath)
+		return c.LoadFromYAMLPath(filepath)
 	}
-	log.Print("Load from env")
-	return c.LoadFromEnv()
+	return nil
 }
 
 var lock = new(sync.RWMutex)

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 )
 
-func TestConfig_LoadFromYAMLPath(t *testing.T) {
-	err := Conf.LoadFromYAMLPath("./test_config.yml")
+func TestConfig_Load(t *testing.T) {
+	err := Conf.Load("./test_config.yml")
 	if err != nil {
 		t.Errorf("Load from yaml faild: %v", err)
 	}

diff --git a/pkg/config/init.go b/pkg/config/init.go
@@ -6,7 +6,6 @@ func Initial(confPath string) {
 	if err := Conf.Load(confPath); err != nil {
 		log.Fatal(err)
 	}
-	log.Printf("Config file Path: %s\n", confPath)
 	Conf.EnsureConfigValid()
 }