mirror of
https://github.com/Radarr/Radarr
synced 2024-12-25 17:27:59 +00:00
Reportingare.ReportException are now routed to ExceptionController
This commit is contained in:
parent
c5d2ba9bef
commit
b2cce4d4f0
2 changed files with 54 additions and 50 deletions
|
@ -72,10 +72,15 @@ public JsonResult ReportNew(ExceptionReport exceptionReport)
|
|||
catch (Exception e)
|
||||
{
|
||||
logger.FatalException("Error has occurred while saving exception", e);
|
||||
if (!exceptionReport.IsProduction)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
return new JsonResult();
|
||||
}
|
||||
|
||||
private string GetExceptionDetailId(ExceptionReport exceptionReport)
|
||||
{
|
||||
var reportHash = Hash(String.Concat(exceptionReport.Version, exceptionReport.String, exceptionReport.Logger));
|
||||
|
|
|
@ -13,18 +13,24 @@ namespace NzbDrone.Services.Service.Controllers
|
|||
public class ReportingController : Controller
|
||||
{
|
||||
private readonly IDatabase _database;
|
||||
private readonly ExceptionController _exceptionController;
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
private const string OK = "OK";
|
||||
|
||||
public ReportingController(IDatabase database)
|
||||
public ReportingController(IDatabase database, ExceptionController exceptionController)
|
||||
{
|
||||
_database = database;
|
||||
_exceptionController = exceptionController;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public JsonResult ParseError(ParseErrorReport parseErrorReport)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
logger.Trace(parseErrorReport.NullSafe());
|
||||
|
||||
if (ParseErrorExists(parseErrorReport.Title))
|
||||
|
@ -38,6 +44,17 @@ public JsonResult ParseError(ParseErrorReport parseErrorReport)
|
|||
|
||||
return Json(OK);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
logger.FatalException("Error has occurred while saving parse report", e);
|
||||
if (!parseErrorReport.IsProduction)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
return new JsonResult();
|
||||
}
|
||||
|
||||
|
||||
private bool ParseErrorExists(string title)
|
||||
|
@ -48,25 +65,7 @@ private bool ParseErrorExists(string title)
|
|||
[HttpPost]
|
||||
public JsonResult ReportException(ExceptionReport exceptionReport)
|
||||
{
|
||||
try
|
||||
{
|
||||
var row = new ExceptionRow();
|
||||
row.LoadBase(exceptionReport);
|
||||
row.LogMessage = exceptionReport.LogMessage;
|
||||
row.Logger = exceptionReport.Logger;
|
||||
row.String = exceptionReport.String;
|
||||
row.Type = exceptionReport.Type;
|
||||
|
||||
_database.Insert(row);
|
||||
|
||||
return Json(OK);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
logger.Trace(exceptionReport.NullSafe());
|
||||
throw;
|
||||
}
|
||||
|
||||
return _exceptionController.ReportNew(exceptionReport);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue