From 02a3c1b224574c091e86a4a912abb63833bcf382 Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Tue, 4 Jul 2023 23:51:10 +0300
Subject: [PATCH] Align ProwlarrErrorPipeline with upstream

---
 .../ErrorManagement/ProwlarrErrorPipeline.cs  | 38 ++++---------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/Prowlarr.Http/ErrorManagement/ProwlarrErrorPipeline.cs b/src/Prowlarr.Http/ErrorManagement/ProwlarrErrorPipeline.cs
index 866a1a9a8..818659889 100644
--- a/src/Prowlarr.Http/ErrorManagement/ProwlarrErrorPipeline.cs
+++ b/src/Prowlarr.Http/ErrorManagement/ProwlarrErrorPipeline.cs
@@ -29,22 +29,17 @@ namespace Prowlarr.Http.ErrorManagement
             var exceptionHandlerPathFeature = context.Features.Get<IExceptionHandlerPathFeature>();
             var exception = exceptionHandlerPathFeature?.Error;
 
-            _logger.Warn(exception);
-
             var statusCode = HttpStatusCode.InternalServerError;
             var errorModel = new ErrorModel
             {
-                Message = exception.Message,
-                Description = exception.ToString()
+                Message = exception?.Message,
+                Description = exception?.ToString()
             };
 
             if (exception is ApiException apiException)
             {
                 _logger.Warn(apiException, "API Error:\n{0}", apiException.Message);
 
-                /* var body = RequestStream.FromStream(context.Request.Body).AsString();
-                 _logger.Trace("Request body:\n{0}", body);*/
-
                 errorModel = new ErrorModel(apiException);
                 statusCode = apiException.StatusCode;
             }
@@ -59,30 +54,15 @@ namespace Prowlarr.Http.ErrorManagement
             }
             else if (exception is NzbDroneClientException clientException)
             {
-                errorModel = new ErrorModel
-                {
-                    Message = exception.Message,
-                    Description = exception.ToString()
-                };
                 statusCode = clientException.StatusCode;
             }
-            else if (exception is ModelNotFoundException notFoundException)
+            else if (exception is ModelNotFoundException)
             {
-                errorModel = new ErrorModel
-                {
-                    Message = exception.Message,
-                    Description = exception.ToString()
-                };
                 statusCode = HttpStatusCode.NotFound;
             }
-            else if (exception is ModelConflictException conflictException)
+            else if (exception is ModelConflictException)
             {
                 _logger.Error(exception, "DB error");
-                errorModel = new ErrorModel
-                {
-                    Message = exception.Message,
-                    Description = exception.ToString()
-                };
                 statusCode = HttpStatusCode.Conflict;
             }
             else if (exception is SQLiteException sqLiteException)
@@ -91,18 +71,16 @@ namespace Prowlarr.Http.ErrorManagement
                 {
                     if (sqLiteException.Message.Contains("constraint failed"))
                     {
-                        errorModel = new ErrorModel
-                        {
-                            Message = exception.Message,
-                        };
                         statusCode = HttpStatusCode.Conflict;
                     }
                 }
 
                 _logger.Error(sqLiteException, "[{0} {1}]", context.Request.Method, context.Request.Path);
             }
-
-            _logger.Fatal(exception, "Request Failed. {0} {1}", context.Request.Method, context.Request.Path);
+            else
+            {
+                _logger.Fatal(exception, "Request Failed. {0} {1}", context.Request.Method, context.Request.Path);
+            }
 
             await errorModel.WriteToResponse(response, statusCode);
         }