blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-03 02:42:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix the InitConfig error

Browse Source
This commit is contained in:
Brabem 2024-02-06 18:58:23 +08:00
parent b74b7f6f81
commit 8330316dda
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/common/config/parse.go
View File

@ -17,7 +17,6 @@ package config
import ( import (
_ "embed" _ "embed"
"fmt" "fmt"
"github.com/OpenIMSDK/tools/errs"
"os" "os"
"path/filepath" "path/filepath"
@ -85,26 +84,25 @@ func GetOptionsByNotification(cfg NotificationConf) msgprocessor.Options {
} }
func initConfig(config any, configName, configFolderPath string) error { func initConfig(config any, configName, configFolderPath string) error {
configFullPath := filepath.Join(configFolderPath, configName) configFolderPath = filepath.Join(configFolderPath, configName)
_, err := os.Stat(configFullPath) _, err := os.Stat(configFolderPath)
if err != nil { if err != nil {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
return errs.Wrap(err, "IsNotExist "+configFolderPath) fmt.Println("stat config path error:", err.Error())
return fmt.Errorf("stat config path error: %w", err)
} }
configFolderPath = filepath.Join(GetProjectRoot(), "config", configName) configFolderPath = filepath.Join(GetProjectRoot(), "config", configName)
errs.Wrap(fmt.Errorf("flag's path,enviment's path,default path all is not exist,using project path:%s", configFolderPath)) fmt.Println("flag's path,enviment's path,default path all is not exist,using project path:", configFolderPath)
} }
data, err := os.ReadFile(configFolderPath) data, err := os.ReadFile(configFolderPath)
if err != nil { if err != nil {
return errs.Wrap(err, "readFile failed, "+configFolderPath) return fmt.Errorf("read file error: %w", err)
} }
if err = yaml.Unmarshal(data, config); err != nil { if err = yaml.Unmarshal(data, config); err != nil {
return errs.Wrap(err, "unmarshal yaml failed, "+configFolderPath) return fmt.Errorf("unmarshal yaml error: %w", err)
} }
fmt.Println("The path of the configuration file to start the process:", configFolderPath) fmt.Println("The path of the configuration file to start the process:", configFolderPath)
return nil return nil
} }