合并代码
This commit is contained in:
1 parent
a2f4c00246
commit
f5037f50a7
3 files changed
+8
-12
No files matched your search
@@ -25,20 +25,13 @@ func ConfigSetup(path string) {
|
||||
if err != nil {
|
||||
log.Fatal(fmt.Sprintf("Read config file fail: %s", err.Error()))
|
||||
}
|
||||
|
||||
|
||||
//Replace environment variables
|
||||
err = viper.ReadConfig(strings.NewReader(os.ExpandEnv(string(content))))
|
||||
if err != nil {
|
||||
log.Fatal(fmt.Sprintf("Parse config file fail: %s", err.Error()))
|
||||
}
|
||||
//}
|
||||
//
|
||||
//func InitConfig(fileName string) {
|
||||
// viper.SetConfigName(fileName)
|
||||
// viper.AddConfigPath("/config")
|
||||
// err := viper.ReadInConfig()
|
||||
// if err != nil {
|
||||
// log.Println(err)
|
||||
// }
|
||||
|
||||
cfgDatabase = viper.Sub("settings.database")
|
||||
if cfgDatabase == nil {
|
||||
|
||||
Reference in new issue
Block a user