self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-16 11:37:58 +02:00
Code Issues Releases Activity

less aggressive http exception logging.

Browse Source
This commit is contained in:
kay.one 2013-07-30 22:35:07 -07:00
parent c57fb29db4
commit 1eb278c7f6
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
NzbDrone.Common/HttpProvider.cs
View File

@ -11,9 +11,9 @@ namespace NzbDrone.Common
{ {
public interface IHttpProvider public interface IHttpProvider
{ {
string DownloadString(string address); string DownloadString(string url);
string DownloadString(string address, string username, string password); string DownloadString(string url, string username, string password);
string DownloadString(string address, ICredentials identity); string DownloadString(string url, ICredentials identity);
Dictionary<string, string> GetHeader(string url); Dictionary<string, string> GetHeader(string url);
Stream DownloadStream(string url, NetworkCredential credential = null); Stream DownloadStream(string url, NetworkCredential credential = null);
@ -34,27 +34,32 @@ public HttpProvider()
_userAgent = String.Format("NzbDrone {0}", BuildInfo.Version); _userAgent = String.Format("NzbDrone {0}", BuildInfo.Version);
} }
public string DownloadString(string address) public string DownloadString(string url)
{ {
return DownloadString(address, null); return DownloadString(url, null);
} }
public string DownloadString(string address, string username, string password) public string DownloadString(string url, string username, string password)
{ {
return DownloadString(address, new NetworkCredential(username, password)); return DownloadString(url, new NetworkCredential(username, password));
} }
public string DownloadString(string address, ICredentials identity) public string DownloadString(string url, ICredentials identity)
{ {
try try
{ {
var client = new WebClient { Credentials = identity }; var client = new WebClient { Credentials = identity };
client.Headers.Add(HttpRequestHeader.UserAgent, _userAgent); client.Headers.Add(HttpRequestHeader.UserAgent, _userAgent);
return client.DownloadString(address); return client.DownloadString(url);
} }
catch (Exception ex) catch (WebException e)
{ {
logger.Trace(ex.Message, ex.ToString()); logger.Warn("Failed to get response from: {0} {1}", url, e.Message);
throw;
}
catch (Exception e)
{
logger.WarnException("Failed to get response from: " + url, e);
throw; throw;
} }
} }
@ -106,10 +111,14 @@ public void DownloadFile(string url, string fileName)
stopWatch.Stop(); stopWatch.Stop();
logger.Trace("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds); logger.Trace("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
} }
catch (Exception ex) catch (WebException e)
{ {
logger.Warn("Failed to get response from: {0}", url); logger.Warn("Failed to get response from: {0} {1}", url, e.Message);
logger.TraceException(ex.Message, ex); throw;
}
catch (Exception e)
{
logger.WarnException("Failed to get response from: " + url, e);
throw; throw;
} }
} }

2
NzbDrone.Core/MediaCover/MediaCoverService.cs
View File

@ -62,7 +62,7 @@ private void DownloadCover(Series series, MediaCover cover)
} }
catch (WebException e) catch (WebException e)
{ {
_logger.WarnException("Couldn't download media cover for " + series, e); _logger.Warn("Couldn't download media cover for " + series);
} }
catch (Exception e) catch (Exception e)
{ {

2
NzbDrone.Core/Parser/Parser.cs
View File

@ -115,8 +115,6 @@ public static ParsedEpisodeInfo ParseTitle(string title)
if (match.Count != 0) if (match.Count != 0)
{ {
Logger.Trace("Matching Regex: '{0}'", regex.ToString());
var result = ParseMatchCollection(match); var result = ParseMatchCollection(match);
if (result != null) if (result != null)
{ {