nil logger should be handled by discard handler

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
pull/31411/head
Evans Mungai 6 months ago
parent 7a5816b106
commit 50e43f4017
No known key found for this signature in database
GPG Key ID: BBEB812143DD14E1

@ -564,9 +564,8 @@ func (cfg *Configuration) Logger() *slog.Logger {
// SetLogger sets the logger for the Configuration. If nil, sets the default logger.
func (cfg *Configuration) SetLogger(newLogger *slog.Logger) {
// Only set logger if it's currently nil
if newLogger == nil {
cfg.logger.Store(slog.Default()) // We never want to set the logger to nil
cfg.logger.Store(slog.New(slog.DiscardHandler)) // Assume nil as discarding logs
return
}
cfg.logger.Store(newLogger)

@ -1208,9 +1208,8 @@ func (c *Client) Logger() *slog.Logger {
}
func (c *Client) SetLogger(newLogger *slog.Logger) {
// Only set logger if it's currently nil
if newLogger == nil {
c.logger.Store(slog.Default()) // We never want to set the logger to nil
c.logger.Store(slog.New(slog.DiscardHandler)) // Assume nil as discarding logs
return
}
c.logger.Store(newLogger)

@ -291,9 +291,8 @@ func (cfgmaps *ConfigMaps) Logger() *slog.Logger {
}
func (cfgmaps *ConfigMaps) SetLogger(newLogger *slog.Logger) {
// Only set logger if it's currently nil
if newLogger == nil {
cfgmaps.logger.Store(slog.Default()) // We never want to set the logger to nil
cfgmaps.logger.Store(slog.New(slog.DiscardHandler)) // Assume nil as discarding logs
return
}
cfgmaps.logger.Store(newLogger)

@ -262,9 +262,8 @@ func (mem *Memory) Logger() *slog.Logger {
}
func (mem *Memory) SetLogger(newLogger *slog.Logger) {
// Only set logger if it's currently nil
if newLogger == nil {
mem.logger.Store(slog.Default()) // We never want to set the logger to nil
mem.logger.Store(slog.New(slog.DiscardHandler)) // Assume nil as discarding logs
return
}
mem.logger.Store(newLogger)

@ -288,9 +288,8 @@ func (secrets *Secrets) Logger() *slog.Logger {
}
func (secrets *Secrets) SetLogger(newLogger *slog.Logger) {
// Only set logger if it's currently nil
if newLogger == nil {
secrets.logger.Store(slog.Default()) // We never want to set the logger to nil
secrets.logger.Store(slog.New(slog.DiscardHandler)) // Assume nil as discarding logs
return
}
secrets.logger.Store(newLogger)

@ -716,9 +716,8 @@ func (s *SQL) Logger() *slog.Logger {
}
func (s *SQL) SetLogger(newLogger *slog.Logger) {
// Only set logger if it's currently nil
if newLogger == nil {
s.logger.Store(slog.Default()) // We never want to set the logger to nil
s.logger.Store(slog.New(slog.DiscardHandler)) // Assume nil as discarding logs
return
}
s.logger.Store(newLogger)

@ -351,9 +351,8 @@ func (s *Storage) Logger() *slog.Logger {
}
func (s *Storage) SetLogger(newLogger *slog.Logger) {
// Only set logger if it's currently nil
if newLogger == nil {
s.logger.Store(slog.Default()) // We never want to set the logger to nil
s.logger.Store(slog.New(slog.DiscardHandler)) // Assume nil as discarding logs
return
}
s.logger.Store(newLogger)

Loading…
Cancel
Save