Merge pull request #42 from bitleak/feature/log-format

ADD: log format config

config/config.go

@@ -28,6 +28,7 @@ type Config struct {
 	AdminPort       int
 	LogLevel        string
 	LogDir          string
+	LogFormat       string
 	EnableAccessLog bool
 	AdminRedis      RedisConf
 	Pool            RedisPool

config/demo-conf.toml

@@ -4,6 +4,7 @@ AdminHost = "127.0.0.1" # optional, default to localhost
 AdminPort = 7778 
 #LogDir = "/var/log/lmstfy"
 LogLevel = "info"
+#LogFormat = "text" # Use LogFormat="json" if wants to print the log with json format
 EnableAccessLog = true
 
 # default params

log/utils.go

@@ -34,7 +34,7 @@ func ReopenLogs(logDir string, accessLogger, errorLogger *logrus.Logger) error {
 }
 
 // @backtrackLevel: log the backtrack info when logging level is >= backtrackLevel
-func SetupLogger(logDir, logLevel, backtrackLevel string) (accessLogger *logrus.Logger, errorLogger *logrus.Logger, err error) {
+func SetupLogger(logFormat, logDir, logLevel, backtrackLevel string) (accessLogger *logrus.Logger, errorLogger *logrus.Logger, err error) {
 	level, err := logrus.ParseLevel(logLevel)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to parse log level: %s", err)
@@ -45,6 +45,12 @@ func SetupLogger(logDir, logLevel, backtrackLevel string) (accessLogger *logrus.
 	}
 	accessLogger = logrus.New()
 	errorLogger = logrus.New()
+
+	if logFormat == "json" {
+		accessLogger.SetFormatter(&logrus.JSONFormatter{})
+		errorLogger.SetFormatter(&logrus.JSONFormatter{})
+	}
+
 	errorLogger.Level = level
 	errorLogger.Hooks.Add(NewBackTrackHook(btLevel))
 	if logDir == "" {

server/main.go

@@ -169,7 +169,7 @@ func main() {
 		panic(fmt.Sprintf("Failed to load config file: %s", err))
 	}
 	shutdown := make(chan struct{})
-	accessLogger, errorLogger, err := log.SetupLogger(conf.LogDir, conf.LogLevel, Flags.BackTrackLevel)
+	accessLogger, errorLogger, err := log.SetupLogger(conf.LogFormat, conf.LogDir, conf.LogLevel, Flags.BackTrackLevel)
 	if err != nil {
 		panic(fmt.Sprintf("Failed to setup logger: %s", err))
 	}