MM-34787: Add colored output for non JSON console logs (#17388)

* MM-34787: Add colored output for non JSON console logs

https://mattermost.atlassian.net/browse/MM-34787

```release-note
A new field EnableColor is added to LogSettings and NotificationLogSettings.
Non-JSON console logs will now be colored if that field is set to true.
```

* Trigger CI
Этот коммит содержится в:
Agniva De Sarker
2021-04-13 23:45:56 +05:30
коммит произвёл GitHub
родитель 6f87eb991f
Коммит fa16ecf98a
4 изменённых файлов: 20 добавлений и 4 удалений

Просмотреть файл

@@ -73,6 +73,7 @@ type TargetInfo logr.TargetInfo
type LoggerConfiguration struct {
EnableConsole bool
ConsoleJson bool
EnableColor bool
ConsoleLevel string
EnableFile bool
FileJson bool
@@ -103,12 +104,15 @@ func getZapLevel(level string) zapcore.Level {
}
}
func makeEncoder(json bool) zapcore.Encoder {
func makeEncoder(json, color bool) zapcore.Encoder {
encoderConfig := zap.NewProductionEncoderConfig()
if json {
return zapcore.NewJSONEncoder(encoderConfig)
}
if color {
encoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
}
encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
return zapcore.NewConsoleEncoder(encoderConfig)
}
@@ -124,7 +128,7 @@ func NewLogger(config *LoggerConfiguration) *Logger {
if config.EnableConsole {
writer := zapcore.Lock(os.Stderr)
core := zapcore.NewCore(makeEncoder(config.ConsoleJson), writer, logger.consoleLevel)
core := zapcore.NewCore(makeEncoder(config.ConsoleJson, config.EnableColor), writer, logger.consoleLevel)
cores = append(cores, core)
}
@@ -153,7 +157,7 @@ func NewLogger(config *LoggerConfiguration) *Logger {
Compress: true,
})
core := zapcore.NewCore(makeEncoder(config.FileJson), writer, logger.fileLevel)
core := zapcore.NewCore(makeEncoder(config.FileJson, false), writer, logger.fileLevel)
cores = append(cores, core)
}
}

Просмотреть файл

@@ -37,7 +37,7 @@ func NewTestingLogger(tb testing.TB, writer io.Writer) *Logger {
mutex: &sync.RWMutex{},
}
logWriterCore := zapcore.NewCore(makeEncoder(true), zapcore.Lock(logWriterSync), testingLogger.consoleLevel)
logWriterCore := zapcore.NewCore(makeEncoder(true, false), zapcore.Lock(logWriterSync), testingLogger.consoleLevel)
testingLogger.zap = zap.New(logWriterCore,
zap.AddCaller(),