feat: change configure file load method

apache · Jun 21, 2021 · 4403a17 · 4403a17
1 parent a03ec49
commit 4403a17
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/api/cmd/root.go b/api/cmd/root.go
@@ -53,7 +53,7 @@ var rootCmd = &cobra.Command{
 func init() {
 	cobra.OnInitialize(onInitialize)
 
-	rootCmd.PersistentFlags().StringVarP(&conf.ConfigFile, "config", "c", "./conf/conf.yaml", "config file")
+	rootCmd.PersistentFlags().StringVarP(&conf.ConfigFile, "config", "c", "", "config file")
 	rootCmd.PersistentFlags().StringVarP(&conf.WorkDir, "work-dir", "p", ".", "current work directory")
 
 	rootCmd.AddCommand(

diff --git a/api/internal/conf/conf.go b/api/internal/conf/conf.go
@@ -150,12 +150,20 @@ func InitConf() {
 }
 
 func setConf() {
-	viper.SetConfigFile(ConfigFile)
+	// if not input config file path, search config file in default path and file name
+	if ConfigFile != "" {
+		viper.SetConfigFile(ConfigFile)
+	} else {
+		viper.SetConfigName("conf.yaml")
+		viper.AddConfigPath(WorkDir)
+		viper.AddConfigPath(WorkDir+"/conf/")
+	}
 	viper.AutomaticEnv()
 
 	if err := viper.ReadInConfig(); err != nil {
-		panic(fmt.Sprintf("fail to read configuration: %s", ConfigFile))
+		panic(fmt.Sprintf("fail to load configuration: %v", err))
 	}
+	log.Printf("config file used: %s", viper.ConfigFileUsed())
 
 	var err error
 	config := Config{}