Merge pull request #12 from Roshick/handleroptions

Secure logging.Logger() from panicking...
Roshick · Dec 13, 2023 · 8dc07fc · 8dc07fc
2 parents 7b77eda + efee6f1
commit 8dc07fc
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go
@@ -20,9 +20,7 @@ type Logging struct {
 }
 
 func New() *Logging {
-	return &Logging{
-		logger: slog.Default(), // ensure non-nil
-	}
+	return &Logging{}
 }
 
 func (l *Logging) WithLogger(logger *slog.Logger) *Logging {
@@ -32,34 +30,29 @@ func (l *Logging) WithLogger(logger *slog.Logger) *Logging {
 }
 
 func (l *Logging) Logger() *slog.Logger {
-	return l.logger
-}
-
-func (l *Logging) Ctx(ctx context.Context) auloggingapi.ContextAwareLoggingImplementation {
-	currentLogger := FromContext(ctx)
-	if currentLogger == nil {
-		currentLogger = l.logger
-	}
+	currentLogger := l.logger
 	if currentLogger == nil {
 		currentLogger = slog.Default()
 	}
 	if currentLogger == nil {
 		currentLogger = slog.New(noophandler.New())
 	}
+	return currentLogger
+}
+
+func (l *Logging) Ctx(ctx context.Context) auloggingapi.ContextAwareLoggingImplementation {
+	currentLogger := FromContext(ctx)
+	if currentLogger == nil {
+		currentLogger = l.Logger()
+	}
 	return &withContext{
 		Logging: l.WithLogger(currentLogger),
 		ctx:     ctx,
 	}
 }
 
 func (l *Logging) NoCtx() auloggingapi.ContextAwareLoggingImplementation {
-	currentLogger := l.logger
-	if currentLogger == nil {
-		currentLogger = slog.Default()
-	}
-	if currentLogger == nil {
-		currentLogger = slog.New(noophandler.New())
-	}
+	currentLogger := l.Logger()
 	return &withContext{
 		Logging: l.WithLogger(currentLogger),
 		ctx:     nil,