diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-16 14:45:46 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-16 14:45:46 -0400 |
commit | f1a830ce9aea87fbeab7e54a6b2b56423e5fed45 (patch) | |
tree | 613bb2cb29cca3016d6b6ac75602aad26303f4f7 /mlog/log.go | |
parent | 16bbbc2abca7c2e5dc2e6876da0dba2bae9eed04 (diff) | |
parent | 02f8c18f40cd0e973e4c75b751e8fcbbbd019728 (diff) | |
download | chat-f1a830ce9aea87fbeab7e54a6b2b56423e5fed45.tar.gz chat-f1a830ce9aea87fbeab7e54a6b2b56423e5fed45.tar.bz2 chat-f1a830ce9aea87fbeab7e54a6b2b56423e5fed45.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'mlog/log.go')
-rw-r--r-- | mlog/log.go | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/mlog/log.go b/mlog/log.go index 28f7408c4..c3261459b 100644 --- a/mlog/log.go +++ b/mlog/log.go @@ -63,6 +63,16 @@ func getZapLevel(level string) zapcore.Level { } } +func makeEncoder(json bool) zapcore.Encoder { + encoderConfig := zap.NewProductionEncoderConfig() + if json { + return zapcore.NewJSONEncoder(encoderConfig) + } + + encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder + return zapcore.NewConsoleEncoder(encoderConfig) +} + func NewLogger(config *LoggerConfiguration) *Logger { cores := []zapcore.Core{} logger := &Logger{ @@ -70,18 +80,9 @@ func NewLogger(config *LoggerConfiguration) *Logger { fileLevel: zap.NewAtomicLevelAt(getZapLevel(config.FileLevel)), } - encoderConfig := zap.NewProductionEncoderConfig() - var encoder zapcore.Encoder - if config.ConsoleJson { - encoder = zapcore.NewJSONEncoder(encoderConfig) - } else { - encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder - encoder = zapcore.NewConsoleEncoder(encoderConfig) - } - if config.EnableConsole { writer := zapcore.Lock(os.Stdout) - core := zapcore.NewCore(encoder, writer, logger.consoleLevel) + core := zapcore.NewCore(makeEncoder(config.ConsoleJson), writer, logger.consoleLevel) cores = append(cores, core) } @@ -91,7 +92,7 @@ func NewLogger(config *LoggerConfiguration) *Logger { MaxSize: 100, Compress: true, }) - core := zapcore.NewCore(encoder, writer, logger.fileLevel) + core := zapcore.NewCore(makeEncoder(config.FileJson), writer, logger.fileLevel) cores = append(cores, core) } |