fixup! respect our logger

grafana · Mar 10, 2023 · 7d0c6a3 · 7d0c6a3
1 parent c5b1746
commit 7d0c6a3
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/log/logger.go b/log/logger.go
@@ -32,20 +32,20 @@ func NewNullLogger() *Logger {
 
 // New creates a new logger.
 func New(logger logrus.FieldLogger, iterID string) *Logger {
-	ll := logrus.New()
+	ll := &Logger{
+		Logger: logrus.New(),
+		iterID: iterID,
+	}
 
 	if logger == nil {
-		ll.Warn("Logger", "no logger supplied, using default")
+		ll.Warnf("Logger", "no logger supplied, using default")
 	} else if l, ok := logger.(*logrus.Logger); !ok {
-		ll.Warn("Logger", "invalid logger type, using default")
+		ll.Warnf("Logger", "invalid logger type %T, using default", logger)
 	} else {
-		ll = l
+		ll.Logger = l
 	}
 
-	return &Logger{
-		Logger: ll,
-		iterID: iterID,
-	}
+	return ll
 }
 
 // Tracef logs a trace message.