Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-04 06:54:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

新增配置文件环境变量支持

Browse Source
This commit is contained in:
duanhf2012
2024-11-29 14:39:04 +08:00
parent c9507f9ee9
commit d29abc0813
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/parsecfg.go
View File

@@ -88,15 +88,16 @@ func yamlToJson(data []byte, v interface{}) ([]byte, error) {
} }
func unmarshalConfig(data []byte, v interface{}) error { func unmarshalConfig(data []byte, v interface{}) error {
if !json.Valid(data) { envData := []byte(os.ExpandEnv(string(data)))
if !json.Valid(envData) {
var err error var err error
data, err = yamlToJson(data, v) envData, err = yamlToJson(envData, v)
if err != nil { if err != nil {
return err return err
} }
} }
return json.Unmarshal(data, v) return json.Unmarshal(envData, v)
} }
func (d *DiscoveryInfo) getDiscoveryType() DiscoveryType { func (d *DiscoveryInfo) getDiscoveryType() DiscoveryType {