Fixed: Log error when health check fails to communicate with download client

This commit is contained in:
Mark McDowall 2014-12-15 12:18:09 -08:00
parent 6d31b14d96
commit 683656c651
2 changed files with 10 additions and 3 deletions

View File

@ -4,6 +4,7 @@ using NUnit.Framework;
using NzbDrone.Core.Download; using NzbDrone.Core.Download;
using NzbDrone.Core.HealthCheck.Checks; using NzbDrone.Core.HealthCheck.Checks;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.HealthCheck.Checks namespace NzbDrone.Core.Test.HealthCheck.Checks
{ {
@ -33,6 +34,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
.Returns(new IDownloadClient[] { downloadClient.Object }); .Returns(new IDownloadClient[] { downloadClient.Object });
Subject.Check().ShouldBeError(); Subject.Check().ShouldBeError();
ExceptionVerification.ExpectedErrors(1);
} }
[Test] [Test]

View File

@ -1,5 +1,6 @@
using System; using System;
using System.Linq; using System.Linq;
using NLog;
using NzbDrone.Core.Download; using NzbDrone.Core.Download;
namespace NzbDrone.Core.HealthCheck.Checks namespace NzbDrone.Core.HealthCheck.Checks
@ -7,10 +8,12 @@ namespace NzbDrone.Core.HealthCheck.Checks
public class DownloadClientCheck : HealthCheckBase public class DownloadClientCheck : HealthCheckBase
{ {
private readonly IProvideDownloadClient _downloadClientProvider; private readonly IProvideDownloadClient _downloadClientProvider;
private readonly Logger _logger;
public DownloadClientCheck(IProvideDownloadClient downloadClientProvider) public DownloadClientCheck(IProvideDownloadClient downloadClientProvider, Logger logger)
{ {
_downloadClientProvider = downloadClientProvider; _downloadClientProvider = downloadClientProvider;
_logger = logger;
} }
public override HealthCheck Check() public override HealthCheck Check()
@ -29,9 +32,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
downloadClient.GetItems(); downloadClient.GetItems();
} }
} }
catch (Exception e) catch (Exception ex)
{ {
return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to communicate with download client " + e.Message); _logger.Error("Unable to communicate with download client: ", ex);
return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to communicate with download client: " + ex.Message);
} }
return new HealthCheck(GetType()); return new HealthCheck(GetType());