Fixed: Don't call for server notifications on event driven check

[common]
pull/1054/head
Qstick 2 years ago
parent 473405ceeb
commit 86fe19a5dd

@ -77,12 +77,15 @@ namespace NzbDrone.Core.HealthCheck
.ToDictionary(g => g.Key, g => g.ToArray()); .ToDictionary(g => g.Key, g => g.ToArray());
} }
private void PerformHealthCheck(IProvideHealthCheck[] healthChecks) private void PerformHealthCheck(IProvideHealthCheck[] healthChecks, bool performServerChecks = false)
{ {
var results = healthChecks.Select(c => c.Check()) var results = healthChecks.Select(c => c.Check())
.ToList(); .ToList();
if (performServerChecks)
{
results.AddRange(_serverSideNotificationService.GetServerChecks()); results.AddRange(_serverSideNotificationService.GetServerChecks());
}
foreach (var result in results) foreach (var result in results)
{ {
@ -108,17 +111,17 @@ namespace NzbDrone.Core.HealthCheck
{ {
if (message.Trigger == CommandTrigger.Manual) if (message.Trigger == CommandTrigger.Manual)
{ {
PerformHealthCheck(_healthChecks); PerformHealthCheck(_healthChecks, true);
} }
else else
{ {
PerformHealthCheck(_scheduledHealthChecks); PerformHealthCheck(_scheduledHealthChecks, true);
} }
} }
public void HandleAsync(ApplicationStartedEvent message) public void HandleAsync(ApplicationStartedEvent message)
{ {
PerformHealthCheck(_startupHealthChecks); PerformHealthCheck(_startupHealthChecks, true);
} }
public void HandleAsync(IEvent message) public void HandleAsync(IEvent message)

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using NLog; using NLog;
using NzbDrone.Common.Cache;
using NzbDrone.Common.Cloud; using NzbDrone.Common.Cloud;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
@ -23,15 +24,28 @@ namespace NzbDrone.Core.HealthCheck
private readonly IHttpRequestBuilderFactory _cloudRequestBuilder; private readonly IHttpRequestBuilderFactory _cloudRequestBuilder;
private readonly Logger _logger; private readonly Logger _logger;
public ServerSideNotificationService(IHttpClient client, IConfigFileProvider configFileProvider, IProwlarrCloudRequestBuilder cloudRequestBuilder, Logger logger) private readonly ICached<List<HealthCheck>> _cache;
public ServerSideNotificationService(IHttpClient client,
IConfigFileProvider configFileProvider,
IProwlarrCloudRequestBuilder cloudRequestBuilder,
ICacheManager cacheManager,
Logger logger)
{ {
_client = client; _client = client;
_configFileProvider = configFileProvider; _configFileProvider = configFileProvider;
_cloudRequestBuilder = cloudRequestBuilder.Services; _cloudRequestBuilder = cloudRequestBuilder.Services;
_logger = logger; _logger = logger;
_cache = cacheManager.GetCache<List<HealthCheck>>(GetType());
} }
public List<HealthCheck> GetServerChecks() public List<HealthCheck> GetServerChecks()
{
return _cache.Get("ServerChecks", () => RetrieveServerChecks(), TimeSpan.FromHours(2));
}
private List<HealthCheck> RetrieveServerChecks()
{ {
var request = _cloudRequestBuilder.Create() var request = _cloudRequestBuilder.Create()
.Resource("/notification") .Resource("/notification")

Loading…
Cancel
Save