Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Log download client name when communication fails

This commit is contained in:
Mark McDowall 2015-10-27 22:19:24 -07:00
parent f0933b9786
commit 2d42c59d70
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientCheckFixture.cs
View File

@ -3,7 +3,9 @@ using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.Download; using NzbDrone.Core.Download;
using NzbDrone.Core.HealthCheck.Checks; using NzbDrone.Core.HealthCheck.Checks;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Test.Common; using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.HealthCheck.Checks namespace NzbDrone.Core.Test.HealthCheck.Checks
@ -25,6 +27,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
public void should_return_error_when_download_client_throws() public void should_return_error_when_download_client_throws()
{ {
var downloadClient = Mocker.GetMock<IDownloadClient>(); var downloadClient = Mocker.GetMock<IDownloadClient>();
downloadClient.Setup(s => s.Definition).Returns(new IndexerDefinition{Name = "Test"});
downloadClient.Setup(s => s.GetItems()) downloadClient.Setup(s => s.GetItems())
.Throws<Exception>(); .Throws<Exception>();

3
src/NzbDrone.Core/Download/IDownloadClient.cs
View File

@ -1,5 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;

16
src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs
View File

@ -25,17 +25,19 @@ namespace NzbDrone.Core.HealthCheck.Checks
return new HealthCheck(GetType(), HealthCheckResult.Warning, "No download client is available"); return new HealthCheck(GetType(), HealthCheckResult.Warning, "No download client is available");
} }
try foreach (var downloadClient in downloadClients)
{ {
foreach (var downloadClient in downloadClients) try
{ {
downloadClient.GetItems(); downloadClient.GetItems();
} }
} catch (Exception ex)
catch (Exception ex) {
{ var message = String.Format("Unable to communicate with {0}.", downloadClient.Definition.Name);
_logger.Error("Unable to communicate with download client: ", ex);
return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to communicate with download client: " + ex.Message); _logger.Error(message, ex);
return new HealthCheck(GetType(), HealthCheckResult.Error, message + " " + ex.Message);
}
} }
return new HealthCheck(GetType()); return new HealthCheck(GetType());