From c6b3a4bb749b0b5b6244395d0d1b2ffd6702c768 Mon Sep 17 00:00:00 2001 From: Yuri Nikolic Date: Wed, 16 Aug 2023 17:24:35 +0200 Subject: [PATCH] Fixing review findings 4 Signed-off-by: Yuri Nikolic --- log/gokit.go | 9 +++++++++ server/server.go | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/log/gokit.go b/log/gokit.go index cc11091f5..c45d6a95f 100644 --- a/log/gokit.go +++ b/log/gokit.go @@ -10,6 +10,7 @@ import ( "os" "github.com/go-kit/log" + "github.com/go-kit/log/level" ) const ( @@ -32,6 +33,14 @@ func NewGoKit(format string, writer io.Writer) log.Logger { return log.NewLogfmtLogger(writer) } +// NewGoKitWithLevel creates a new GoKit logger with the given level, format and writer. +// If the given writer is nil, os.Stderr is used. +// If the given format is nil, logfmt is used. +func NewGoKitWithLevel(lvl Level, format string, writer io.Writer) log.Logger { + logger := NewGoKit(format, writer) + return level.NewFilter(logger, lvl.Option) +} + // stand-alone for test purposes func addStandardFields(logger log.Logger) log.Logger { return log.With(logger, "ts", log.DefaultTimestampUTC, "caller", log.Caller(5)) diff --git a/server/server.go b/server/server.go index 86fb63322..0a69aa7a1 100644 --- a/server/server.go +++ b/server/server.go @@ -236,7 +236,7 @@ func newServer(cfg Config, metrics *Metrics) (*Server, error) { // If user doesn't supply a logging implementation, by default instantiate go-kit. logger := cfg.Log if logger == nil { - logger = log.NewGoKit(log.LogfmtFormat, os.Stderr) + logger = log.NewGoKitWithLevel(cfg.LogLevel, cfg.LogFormat, os.Stderr) } gatherer := cfg.Gatherer