blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-31 20:09:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

test cobra

Browse Source
This commit is contained in:
wangchuxiao 2023-03-06 18:52:49 +08:00
parent 373b317b1a
commit 6ad93962aa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/common/config/config.go
View File

@ -2,6 +2,7 @@ package config
import ( import (
"OpenIM/pkg/discoveryregistry" "OpenIM/pkg/discoveryregistry"
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -500,10 +501,14 @@ func (c *config) initConfig(config interface{}, configName, configFolderPath str
if configFolderPath == "" { if configFolderPath == "" {
configFolderPath = DefaultFolderPath configFolderPath = DefaultFolderPath
} }
_, err := os.Stat(filepath.Join(configFolderPath, configName)) configPath := filepath.Join(configFolderPath, configName)
var configPath string _, err := os.Stat(configPath)
if os.IsNotExist(err) { if err != nil {
if !os.IsNotExist(err) {
return err
}
configPath = filepath.Join(Root, "config", configName) configPath = filepath.Join(Root, "config", configName)
fmt.Println(configPath, "not exist, use", configPath)
} }
Root = filepath.Dir(configPath) Root = filepath.Dir(configPath)
return c.unmarshalConfig(config, configPath) return c.unmarshalConfig(config, configPath)