From 978a19d6b1f0bd6d2c2f8761dde73b55c4879924 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Thu, 20 Jun 2024 18:25:15 +0200
Subject: [PATCH] [backend/logging] Improve logging in ErrorHandlerMiddleware
 further

---
 .../Core/Middleware/ErrorHandlerMiddleware.cs | 46 ++++++-------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs b/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs
index e3eae4ff..fa2f77c9 100644
--- a/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs
+++ b/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs
@@ -35,32 +35,17 @@ public class ErrorHandlerMiddleware(
 			{
 				if (e is GracefulException { SuppressLog: false } earlyCe)
 				{
+					var level = earlyCe.SuppressLog ? LogLevel.Trace : LogLevel.Debug;
 					if (earlyCe.Details != null)
 					{
-						logger.LogDebug("Request {id} was rejected with {statusCode} {error}: {message} - {details}",
-						                ctx.TraceIdentifier, (int)earlyCe.StatusCode, earlyCe.Error, earlyCe.Message,
-						                earlyCe.Details);
+						logger.Log(level, "Request {id} was rejected with {statusCode} {error}: {message} - {details}",
+						           ctx.TraceIdentifier, (int)earlyCe.StatusCode, earlyCe.Error, earlyCe.Message,
+						           earlyCe.Details);
 					}
 					else
 					{
-						logger.LogDebug("Request {id} was rejected with {statusCode} {error}: {message}",
-						                ctx.TraceIdentifier, (int)earlyCe.StatusCode, earlyCe.Error, earlyCe.Message);
-					}
-				}
-
-				if (e is GracefulException { SuppressLog: true } earlyCeSuppressed)
-				{
-					if (earlyCeSuppressed.Details != null)
-					{
-						logger.LogTrace("Request {id} was rejected with {statusCode} {error}: {message} - {details} (log suppressed)",
-						                ctx.TraceIdentifier, (int)earlyCeSuppressed.StatusCode, earlyCeSuppressed.Error,
-						                earlyCeSuppressed.Message, earlyCeSuppressed.Details);
-					}
-					else
-					{
-						logger.LogTrace("Request {id} was rejected with {statusCode} {error}: {message} (log suppressed)",
-						                ctx.TraceIdentifier, (int)earlyCeSuppressed.StatusCode, earlyCeSuppressed.Error,
-						                earlyCeSuppressed.Message);
+						logger.Log(level, "Request {id} was rejected with {statusCode} {error}: {message}",
+						           ctx.TraceIdentifier, (int)earlyCe.StatusCode, earlyCe.Error, earlyCe.Message);
 					}
 				}
 				else
@@ -123,16 +108,15 @@ public class ErrorHandlerMiddleware(
 						RequestId = ctx.TraceIdentifier
 					});
 
-				if (!ce.SuppressLog)
-				{
-					if (ce.Details != null)
-						logger.LogDebug("Request {id} was rejected by {source} with {statusCode} {error}: {message} - {details}",
-						                ctx.TraceIdentifier, type, (int)ce.StatusCode, ce.Error, ce.Message,
-						                ce.Details);
-					else
-						logger.LogDebug("Request {id} was rejected by {source} with {statusCode} {error}: {message}",
-						                ctx.TraceIdentifier, type, (int)ce.StatusCode, ce.Error, ce.Message);
-				}
+				var level = ce.SuppressLog ? LogLevel.Trace : LogLevel.Debug;
+
+				if (ce.Details != null)
+					logger.Log(level,
+					           "Request {id} was rejected by {source} with {statusCode} {error}: {message} - {details}",
+					           ctx.TraceIdentifier, type, (int)ce.StatusCode, ce.Error, ce.Message, ce.Details);
+				else
+					logger.Log(level, "Request {id} was rejected by {source} with {statusCode} {error}: {message}",
+					           ctx.TraceIdentifier, type, (int)ce.StatusCode, ce.Error, ce.Message);
 			}
 			else
 			{