feat: output json logs by default (#348)

tigrisdata-archive · Jul 12, 2022 · 0c8c31e · 0c8c31e
1 parent 328aaa8
commit 0c8c31e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/config/server.dev.yaml b/config/server.dev.yaml
@@ -23,6 +23,7 @@ search:
 
 log:
   level: trace
+  format: console
 
 foundationdb:
   cluster_file: "./test/config/fdb.cluster"
diff --git a/util/log/log.go b/util/log/log.go
@@ -26,7 +26,8 @@ import (
 )
 
 type LogConfig struct {
-	Level string
+	Level  string
+	Format string
 }
 
 // trim full path. output in the form directory/file.go
@@ -49,14 +50,18 @@ func consoleFormatCaller(i interface{}) string {
 func Configure(config LogConfig) {
 	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
 	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-	output := zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}
-	output.FormatCaller = consoleFormatCaller
 	lvl, err := zerolog.ParseLevel(config.Level)
 	if err != nil {
 		log.Error().Err(err).Msg("error parsing log level. defaulting to info level")
 		lvl = zerolog.InfoLevel
 	}
-	log.Logger = zerolog.New(output).Level(lvl).With().Timestamp().CallerWithSkipFrameCount(3).Stack().Logger()
+	if config.Format == "console" {
+		output := zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}
+		output.FormatCaller = consoleFormatCaller
+		log.Logger = zerolog.New(output).Level(lvl).With().Timestamp().CallerWithSkipFrameCount(3).Stack().Logger()
+	} else {
+		log.Logger = zerolog.New(os.Stdout).Level(lvl).With().Timestamp().CallerWithSkipFrameCount(3).Stack().Logger()
+	}
 }
 
 func E(err error) bool {