refactor(cmd): create config in root

dreamvo · Aug 23, 2020 · 73975fe · 73975fe
1 parent eb774ad
commit 73975fe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/dreamvo/gilfoyle/config"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -17,6 +18,11 @@ var rootCmd = &cobra.Command{
 }
 
 func init() {
+	err := config.NewConfig()
+	if err != nil {
+		panic(err)
+	}
+
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file path (default ./gilfoyle.yaml")
 }
 

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -26,7 +26,7 @@ var serveCmd = &cobra.Command{
 	Use:   "serve",
 	Short: "RegisterRoutes REST API",
 	Run: func(cmd *cobra.Command, args []string) {
-		err := db.InitClient(config.NewConfig())
+		err := db.InitClient(config.GetConfig())
 		if err != nil {
 			log.Fatalf("failed opening connection: %v", err)
 		}

diff --git a/config/config.go b/config/config.go
@@ -42,10 +42,13 @@ type settingsConfig struct {
 var c Config
 
 // NewConfig a new config object
-func NewConfig() *Config {
-	_ = configor.Load(&c)
+func NewConfig(files ...string) error {
+	err := configor.Load(&c, files...)
+	if err != nil {
+		return err
+	}
 
-	return &c
+	return nil
 }
 
 // GetConfig helps you to get configuration data