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

test cobra

Browse Source
This commit is contained in:
wangchuxiao 2023-03-06 18:41:59 +08:00
parent 5a77f91fa0
commit 757fd4bf0b
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/api/main.go
View File

@ -18,9 +18,9 @@ var startCmd = &cobra.Command{
Short: "Start the server",
Run: func(cmd *cobra.Command, args []string) {
port, _ := cmd.Flags().GetInt("port")
configPath, _ := cmd.Flags().GetString("config_path")
fmt.Printf("Starting server on port %s with config file at %s\n", port, configPath)
if err := run(port); err != nil {
configFolderPath, _ := cmd.Flags().GetString("config_folder_path")
fmt.Printf("Starting server on port %s with config file at %s\n", port, configFolderPath)
if err := run(configFolderPath, port); err != nil {
panic(err.Error())
}
},
@ -31,8 +31,8 @@ func init() {
startCmd.Flags().StringP("config_path", "c", "", "Path to config file folder")
}
func run(port int) error {
if err := config.InitConfig(); err != nil {
func run(configFolderPath string, port int) error {
if err := config.InitConfig(configFolderPath); err != nil {
return err
}
log.NewPrivateLog(constant.LogFileName)

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

@ -2,7 +2,6 @@ package config
import (
"OpenIM/pkg/discoveryregistry"
"flag"
"io/ioutil"
"os"
"path/filepath"
@ -21,7 +20,7 @@ const (
FileName = "config.yaml"
NotificationFileName = "notification.yaml"
ENV = "CONFIG_NAME"
DefaultPath = "../config/"
DefaultFolderPath = "../config/"
ConfKey = "conf"
)
@ -497,11 +496,12 @@ func (c *config) unmarshalConfig(config interface{}, configPath string) error {
return nil
}
func (c *config) initConfig(config interface{}, configName, configPath string) error {
if configPath == "" {
configPath = DefaultPath
func (c *config) initConfig(config interface{}, configName, configFolderPath string) error {
if configFolderPath == "" {
configFolderPath = DefaultFolderPath
}
_, err := os.Stat(filepath.Join(configPath, configName))
_, err := os.Stat(filepath.Join(configFolderPath, configName))
var configPath string
if os.IsNotExist(err) {
configPath = filepath.Join(Root, "config", configName)
}
@ -521,14 +521,12 @@ func (c *config) GetConfFromRegistry(registry discoveryregistry.SvcDiscoveryRegi
return registry.GetConfFromRegistry(ConfKey)
}
func InitConfig() error {
configPath := flag.String("config_path", os.Getenv(ENV), "folder for config")
flag.Parse()
err := Config.initConfig(&Config, FileName, *configPath)
func InitConfig(configFolderPath string) error {
err := Config.initConfig(&Config, FileName, configFolderPath)
if err != nil {
return err
}
err = Config.initConfig(&Config.Notification, NotificationFileName, *configPath)
err = Config.initConfig(&Config.Notification, NotificationFileName, configFolderPath)
if err != nil {
return err
}