Backup_Repos/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr synced 2026-05-05 19:20:19 +02:00
Code Issues Projects Releases Wiki Activity

Align ProwlarrErrorPipeline with upstream

Browse source
This commit is contained in:
Bogdan 2023-07-04 23:51:10 +03:00
parent 57efa6d0b1
commit 02a3c1b224
1 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/Prowlarr.Http/ErrorManagement/ProwlarrErrorPipeline.cs
View file

@ -29,22 +29,17 @@ public async Task HandleException(HttpContext context)
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 @@ public async Task HandleException(HttpContext context)
}
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 @@ public async Task HandleException(HttpContext context)
{
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);
}