From 22a39ed4d3ef3a881b3eca1a17a602e6c7d6342c Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 1 Aug 2022 16:56:06 +0800 Subject: [PATCH] config file update --- pkg/common/config/config.go | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 217986f05..f7d7d20f2 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -512,15 +512,28 @@ type PDefaultTips struct { func init() { cfgName := os.Getenv("CONFIG_NAME") - if len(cfgName) != 0 { - Root = cfgName - } fmt.Println("GET IM DEFAULT CONFIG PATH :", Root, "ENV PATH:", cfgName) - bytes, err := ioutil.ReadFile(filepath.Join(Root, "config", "config.yaml")) - if err != nil { - panic(err.Error()) - } - if err = yaml.Unmarshal(bytes, &Config); err != nil { - panic(err.Error()) + if len(cfgName) != 0 { + bytes, err := ioutil.ReadFile(filepath.Join(cfgName, "config", "config.yaml")) + if err != nil { + bytes, err = ioutil.ReadFile(filepath.Join(Root, "config", "config.yaml")) + if err != nil { + panic(err.Error()) + } + } else { + Root = cfgName + } + if err = yaml.Unmarshal(bytes, &Config); err != nil { + panic(err.Error()) + } + } else { + bytes, err := ioutil.ReadFile(filepath.Join(Root, "config", "config.yaml")) + if err != nil { + panic(err.Error()) + } + if err = yaml.Unmarshal(bytes, &Config); err != nil { + panic(err.Error()) + } } + }