refactor: add ParseMetaKeyFlagFiles

sandwich-go · Jan 20, 2022 · f653648 · f653648
1 parent 6a1bab0
commit f653648
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/gen_options_optiongen.go b/gen_options_optiongen.go
diff --git a/option.go b/option.go
@@ -80,6 +80,9 @@ func OptionsOptionDeclareWithDefault() interface{} {
 		"TagNameForDefaultValue": string(DefaultValueTagName),
 		// annotation@ReplaceFlagSetUsage(comment="是否替换FlagSet的Usage，使用xconf内置版本")
 		"ReplaceFlagSetUsage": true,
+		// annotation@ParseMetaKeyFlagFiles(comment="是否解析flag中的MetaKeyFlagFiles指定的文件")
+		// 当一个app中有多个根配置，只能有一个根配置解析flag中的配置文件
+		"ParseMetaKeyFlagFiles": true,
 		// annotation@StringAlias(comment="值别名")
 		"StringAlias": (map[string]string)(map[string]string{
 			"math.MaxInt":    strconv.Itoa(maxInt),

diff --git a/xconf.go b/xconf.go
@@ -270,7 +270,7 @@ func (x *XConf) parseFlagFilesForXConf(flagSet *flag.FlagSet, args ...string) (f
 		return
 	}
 
-	if v := flagData[MetaKeyFlagFiles]; v != nil {
+	if v := flagData[MetaKeyFlagFiles]; v != nil && x.cc.ParseMetaKeyFlagFiles {
 		filesToParse = strings.Split(strings.Trim(v.(string), " "), ",")
 		x.cc.LogDebug(fmt.Sprintf("config files changed from:%v to %v provided by FlagSet", x.cc.Files, filesToParse))
 	}