Merge pull request #55 from cloud-barista/feature/update-logger

Feature/update logger

cmd/create.go

@@ -17,8 +17,7 @@ package cmd
 
 import (
 	"github.com/cloud-barista/mc-data-manager/internal/execfunc"
-	"github.com/cloud-barista/mc-data-manager/internal/log"
-	"github.com/sirupsen/logrus"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -36,9 +35,8 @@ Semi-structured data: json, xml
 
 You must enter the data size in GB.`,
 	Run: func(_ *cobra.Command, _ []string) {
-		logrus.SetFormatter(&log.CustomTextFormatter{CmdName: "create", JobName: "dummy create"})
 		if err := execfunc.DummyCreate(commandTask); err != nil {
-			logrus.Errorf("dummy create failed : %v", err)
+			log.Error().Str("CmdName", "create").Str("JobName", "dummy create").Msgf("dummy create failed : %v", err)
 		}
 	},
 }

cmd/delete.go

@@ -18,8 +18,7 @@ package cmd
 import (
 	"os"
 
-	"github.com/cloud-barista/mc-data-manager/internal/log"
-	"github.com/sirupsen/logrus"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -35,14 +34,14 @@ var deleteLocalCmd = &cobra.Command{
 	Use: "local",
 
 	Run: func(cmd *cobra.Command, args []string) {
-		logrus.SetFormatter(&log.CustomTextFormatter{CmdName: "delete"})
-		logrus.WithFields(logrus.Fields{"jobName": "local delete"}).Info("start deleting local data")
+		// logrus.SetFormatter(&log.CustomTextFormatter{CmdName: "delete"})
+		log.Info().Msg("start deleting local data")
 
 		if err := os.RemoveAll(commandTask.Directory); err != nil {
-			logrus.WithFields(logrus.Fields{"jobName": "local delete"}).Errorf("failed to delete local : %v", err)
+			log.Error().Str("jobName", "local delete").Msgf("failed to delete local : %v", err)
 			return
 		}
-		logrus.Infof("successfully deleted : %s\n", commandTask.Directory)
+		log.Info().Msgf("successfully deleted : %s\n", commandTask.Directory)
 
 	},
 }

cmd/server.go

@@ -16,9 +16,6 @@ limitations under the License.
 package cmd
 
 import (
-	log "github.com/cloud-barista/mc-data-manager/internal/zerolog"
-	"github.com/rs/zerolog"
-
 	dmsv "github.com/cloud-barista/mc-data-manager/websrc/serve"
 	"github.com/spf13/cobra"
 )
@@ -32,7 +29,6 @@ var serverCmd = &cobra.Command{
 	Short: "Start Web Server",
 	Long:  `Start Web Server`,
 	Run: func(cmd *cobra.Command, args []string) {
-		log.GetInstance().NewLogEntry().WithCmdName("server").WithJobName("web Server").WithLevel(zerolog.InfoLevel).WithMessage("Start Web Server")
 		dmsv.Run(dmsv.InitServer(listenPort, allowIP...), listenPort)
 	},
 }

cmd/test.go

@@ -17,8 +17,7 @@ package cmd
 
 import (
 	"github.com/cloud-barista/mc-data-manager/internal/execfunc"
-	"github.com/cloud-barista/mc-data-manager/internal/log"
-	"github.com/sirupsen/logrus"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -28,9 +27,8 @@ var testCmd = &cobra.Command{
 	Short: "test-command",
 	Long:  `test-command`,
 	Run: func(_ *cobra.Command, _ []string) {
-		logrus.SetFormatter(&log.CustomTextFormatter{CmdName: "test", JobName: "test dummy create"})
 		if err := execfunc.DummyCreate(commandTask); err != nil {
-			logrus.Errorf("test dummy create failed : %v", err)
+			log.Error().Msgf("test dummy create failed : %v", err)
 		}
 	},
 }

config/config.go

@@ -7,8 +7,66 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+
+	"github.com/rs/zerolog/log"
+	"github.com/spf13/viper"
 )
 
+var Settings InitConfig
+
+type InitConfig struct {
+	Profile ProfileConfig `mapstructure:"profile"`
+	Logger  LogConfig     `mapstructure:"log"`
+}
+
+type ProfileConfig struct {
+	Default string `mapstructure:"default"`
+}
+
+type LogConfig struct {
+	ZeroConfig `mapstructure:",squash"`
+	File       LumberConfig `mapstructure:",squash"`
+}
+
+type ZeroConfig struct {
+	LogLevel  string `mapstructure:"level"`
+	LogWriter string `mapstructure:"writer"`
+}
+type LumberConfig struct {
+	Path       string `mapstructure:"filepath"`
+	MaxSize    int    `mapstructure:"maxsize"`
+	MaxBackups int    `mapstructure:"maxbackups"`
+	MaxAge     int    `mapstructure:"maxage"`
+	Compress   bool   `mapstructure:"compress"`
+}
+
+// init
+func Init() {
+	execPath, err := os.Executable()
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to get executable path")
+		log.Info().Msg("Using Default Config")
+	}
+	viper.AddConfigPath(filepath.Join(execPath, "../../data/var/run/data-manager/config"))
+	viper.AddConfigPath(filepath.Join(execPath, "/data/var/run/data-manager/config"))
+	viper.AddConfigPath(filepath.Join(execPath, "./"))
+	viper.AddConfigPath(filepath.Join(execPath, "./config/"))
+	viper.SetConfigName("config")
+
+	err = viper.ReadInConfig()
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to read config file")
+		return
+	}
+
+	err = viper.Unmarshal(&Settings)
+	if err != nil {
+		log.Fatal().Err(err).Msg("Unable to decode into struct")
+	}
+	log.Debug().Msgf("config params : %+v", Settings)
+	log.Info().Str("loglevel", Settings.Logger.LogLevel).Msg("Logger initialized with loglevel")
+}
+
 // ConfigManager structure definition
 type ConfigManager struct {
 	DefaultProfile string

data/var/run/data-manager/config/config.json

@@ -1,3 +1,14 @@
 {
-    "defaultProfile":"default"
+    "profile":{
+        "default":"default"
+    },
+    "log":{
+        "level":"debug",
+        "writer":"both",
+        "filepath": "./data/var/log/data-manager.log",
+        "maxsize": 1000,
+        "maxbackups": 3,
+        "maxage": 30,
+        "compress": false
+    }
 }