From 5f9af24b97ade9ab0e4cd6fe811bee084933699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sat, 7 Sep 2024 23:18:41 +0200 Subject: [PATCH] slog: expose io.Writer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- promslog/slog.go | 16 ++++++++-------- promslog/slog_test.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/promslog/slog.go b/promslog/slog.go index 7fb24d41..5a3a6f87 100644 --- a/promslog/slog.go +++ b/promslog/slog.go @@ -148,10 +148,10 @@ func (f *AllowedFormat) Set(s string) error { // Config is a struct containing configurable settings for the logger type Config struct { - Level *AllowedLevel - Format *AllowedFormat - Style LogStyle - ioWriter io.Writer + Level *AllowedLevel + Format *AllowedFormat + Style LogStyle + Writer io.Writer } // New returns a new slog.Logger. Each logged line will be annotated @@ -162,8 +162,8 @@ func New(config *Config) *slog.Logger { _ = config.Level.Set("info") } - if config.ioWriter == nil { - config.ioWriter = defaultWriter + if config.Writer == nil { + config.Writer = defaultWriter } logHandlerOpts := &slog.HandlerOptions{ @@ -176,7 +176,7 @@ func New(config *Config) *slog.Logger { } if config.Format != nil && config.Format.s == "json" { - return slog.New(slog.NewJSONHandler(config.ioWriter, logHandlerOpts)) + return slog.New(slog.NewJSONHandler(config.Writer, logHandlerOpts)) } - return slog.New(slog.NewTextHandler(config.ioWriter, logHandlerOpts)) + return slog.New(slog.NewTextHandler(config.Writer, logHandlerOpts)) } diff --git a/promslog/slog_test.go b/promslog/slog_test.go index 5f37e189..69e3f6fc 100644 --- a/promslog/slog_test.go +++ b/promslog/slog_test.go @@ -112,7 +112,7 @@ func TestDynamicLevels(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { buf.Reset() // Ensure buf is reset prior to tests - config := &Config{ioWriter: &buf, Style: tc.logStyle} + config := &Config{Writer: &buf, Style: tc.logStyle} logger := New(config) // Test that log level can be adjusted on-the-fly to debug and that a