From 4e3968e2d2ae28ac8c4badda2f4e14db9e51e002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Mon, 24 Apr 2023 23:58:02 +0200 Subject: [PATCH] Remove unnecessary else and use NewSyncWriter again --- promlog/log.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/promlog/log.go b/promlog/log.go index bb49848f..3ac7b3fd 100644 --- a/promlog/log.go +++ b/promlog/log.go @@ -112,10 +112,10 @@ type Config struct { // with a timestamp. The output always goes to stderr. func New(config *Config) log.Logger { if config.Format != nil && config.Format.s == "json" { - return NewWithLogger(log.NewJSONLogger(os.Stderr), config) - } else { - return NewWithLogger(log.NewLogfmtLogger(os.Stderr), config) + return NewWithLogger(log.NewJSONLogger(log.NewSyncWriter(os.Stderr)), config) } + + return NewWithLogger(log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr)), config) } // NewWithLogger returns a new leveled oklog logger with a custom log.Logger. @@ -135,10 +135,10 @@ func NewWithLogger(l log.Logger, config *Config) log.Logger { // changed, like the level. func NewDynamic(config *Config) *logger { if config.Format != nil && config.Format.s == "json" { - return NewDynamicWithLogger(log.NewJSONLogger(os.Stderr), config) - } else { - return NewDynamicWithLogger(log.NewLogfmtLogger(os.Stderr), config) + return NewDynamicWithLogger(log.NewJSONLogger(log.NewSyncWriter(os.Stderr)), config) } + + return NewDynamicWithLogger(log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr)), config) } // NewDynamicWithLogger returns a new leveled logger with a custom io.Writer.