program parameter should not be overwritten from program-default sect…

…ion if the parameter already exists #228
ochinchina · Oct 14, 2020 · 7322541 · 7322541
1 parent 430235c
commit 7322541
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/config/config.go b/config/config.go
@@ -193,7 +193,9 @@ func (c *Config) setProgramDefaultParams(cfg *ini.Ini) {
 				continue
 			}
 			for _, key := range program_default_section.Keys() {
-				section.Add(key.Name(), key.ValueWithDefault(""))
+				if !section.HasKey(key.Name()) {
+					section.Add(key.Name(), key.ValueWithDefault(""))
+				}
 			}
 
 		}

diff --git a/config/config_test.go b/config/config_test.go
@@ -183,7 +183,8 @@ func TestConfigWithInclude(t *testing.T) {
 }
 
 func TestDefaultParams(t *testing.T) {
-	config, _ := parse([]byte("[program:test]\nautorestart=true\ntest=1\n[program-default]\ncommand=/usr/bin/ls\nrestart=true\nautorestart=false"))
+	s := "[program:test]\nautorestart=true\ntest=1\n[program-default]\ncommand=/usr/bin/ls\nrestart=true\nautorestart=false"
+	config, _ := parse([]byte(s))
 	entry := config.GetProgram("test")
 	if entry.GetString("command", "") != "/usr/bin/ls" {
 		t.Error("fail to get command of program")