Reportingare.ReportException are now routed to ExceptionController

pull/4/head
kay.one 13 years ago
parent c5d2ba9bef
commit b2cce4d4f0

@ -72,10 +72,15 @@ namespace NzbDrone.Services.Service.Controllers
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 @@ namespace NzbDrone.Services.Service.Controllers
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 @@ namespace NzbDrone.Services.Service.Controllers
[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…
Cancel
Save