slogutil: fix RecoverAndExit

AdguardTeam · Feb 27, 2025 · c94fe95 · c94fe95
1 parent 5865a4b
commit c94fe95
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/logutil/slogutil/defer.go b/logutil/slogutil/defer.go
@@ -57,10 +57,15 @@ func RecoverAndLogDefault(ctx context.Context) {
 	PrintRecovered(ctx, l, v)
 }
 
-// RecoverAndExit recovers a panic, logs it using l, and then exits with the
-// given exit code.  l must not be nil.
+// RecoverAndExit recovers a panic and, if there is one logs it using l and then
+// exits with the given exit code.  l must not be nil.
 func RecoverAndExit(ctx context.Context, l *slog.Logger, code osutil.ExitCode) {
-	PrintRecovered(ctx, l, recover())
+	v := recover()
+	if v == nil {
+		return
+	}
+
+	PrintRecovered(ctx, l, v)
 
 	os.Exit(code)
 }