tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-27 22:56:45 -04:00
Code Issues Projects Releases Wiki Activity

Cleanse Log Exception Data (#83)

Browse Source
This commit is contained in:
Qstick
2017-09-02 06:39:21 -04:00
committed by GitHub
parent 0b22d7fce3
commit 0807fcc616
12 changed files with 283 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
+4 -3
View File
@@ -212,6 +212,7 @@ namespace NzbDrone.Core.Indexers
catch (CloudFlareCaptchaException ex)
{
_indexerStatusService.RecordFailure(Definition.Id);
ex.WithData("FeedUrl", url);
if (ex.IsExpired)
{
_logger.Error(ex, "Expired CAPTCHA token for {0}, please refresh in indexer settings.", this);
@@ -226,11 +227,11 @@ namespace NzbDrone.Core.Indexers
_indexerStatusService.RecordFailure(Definition.Id);
_logger.Warn(ex, "{0}", url);
}
catch (Exception feedEx)
catch (Exception ex)
{
_indexerStatusService.RecordFailure(Definition.Id);
feedEx.Data.Add("FeedUrl", url);
_logger.Error(feedEx, "An error occurred while processing feed. {0}", url);
ex.WithData("FeedUrl", url);
_logger.Error(ex, "An error occurred while processing feed. {0}", url);
}
return CleanupReleases(releases);
src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs
+2 -1
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Net;
using System.Xml;
@@ -69,6 +69,7 @@ namespace NzbDrone.Core.Indexers.Newznab
catch (XmlException ex)
{
_logger.Debug(ex, "Failed to parse newznab api capabilities for {0}.", indexerSettings.Url);
ex.WithData(response);
throw;
}
catch (Exception ex)
src/NzbDrone.Core/Indexers/RssParser.cs
+6 -5
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
@@ -65,12 +65,14 @@ namespace NzbDrone.Core.Indexers
}
catch (UnsupportedFeedException itemEx)
{
itemEx.Data.Add("Item", item.Title());
itemEx.WithData("FeedUrl", indexerResponse.Request.Url);
itemEx.WithData("ItemTitle", item.Title());
throw;
}
catch (Exception itemEx)
{
itemEx.Data.Add("Item", item.Title());
itemEx.WithData("FeedUrl", indexerResponse.Request.Url);
itemEx.WithData("ItemTitle", item.Title());
_logger.Error(itemEx, "An error occurred while processing feed item from {0}", indexerResponse.Request.Url);
}
}
@@ -95,8 +97,7 @@ namespace NzbDrone.Core.Indexers
var contentSample = indexerResponse.Content.Substring(0, Math.Min(indexerResponse.Content.Length, 512));
_logger.Debug("Truncated response content (originally {0} characters): {1}", indexerResponse.Content.Length, contentSample);
ex.Data.Add("ContentLength", indexerResponse.Content.Length);
ex.Data.Add("ContentSample", contentSample);
ex.WithData(indexerResponse.HttpResponse);
throw;
}
src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssSettingsDetector.cs
+19 -11
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using System.IO;
using System.Text.RegularExpressions;
@@ -40,22 +40,30 @@ namespace NzbDrone.Core.Indexers.TorrentRss
{
_logger.Debug("Evaluating TorrentRss feed '{0}'", indexerSettings.BaseUrl);
var requestGenerator = new TorrentRssIndexerRequestGenerator { Settings = indexerSettings };
var request = requestGenerator.GetRecentRequests().GetAllTiers().First().First();
HttpResponse httpResponse = null;
try
{
httpResponse = _httpClient.Execute(request.HttpRequest);
var requestGenerator = new TorrentRssIndexerRequestGenerator { Settings = indexerSettings };
var request = requestGenerator.GetRecentRequests().GetAllTiers().First().First();
HttpResponse httpResponse = null;
try
{
httpResponse = _httpClient.Execute(request.HttpRequest);
}
catch (Exception ex)
{
_logger.Warn(ex, string.Format("Unable to connect to indexer {0}: {1}", request.Url, ex.Message));
return null;
}
var indexerResponse = new IndexerResponse(request, httpResponse);
return GetParserSettings(indexerResponse, indexerSettings);
}
catch (Exception ex)
{
_logger.Warn(ex, string.Format("Unable to connect to indexer {0}: {1}", request.Url, ex.Message));
return null;
ex.WithData("FeedUrl", indexerSettings.BaseUrl);
throw;
}
var indexerResponse = new IndexerResponse(request, httpResponse);
return GetParserSettings(indexerResponse, indexerSettings);
}
private TorrentRssIndexerParserSettings GetParserSettings(IndexerResponse response, TorrentRssIndexerSettings indexerSettings)