github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 21:13:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Qstick 2022-07-03 12:26:02 -05:00
commit 1d73d25fb2
2 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
View file

@ -77,7 +77,7 @@ namespace NzbDrone.Core.HealthCheck
.ToDictionary(g => g.Key, g => g.ToArray()); .ToDictionary(g => g.Key, g => g.ToArray());
} }
private void PerformHealthCheck(IProvideHealthCheck[] healthChecks, IEvent message = null) private void PerformHealthCheck(IProvideHealthCheck[] healthChecks, IEvent message = null, bool performServerChecks = false)
{ {
var results = new List<HealthCheck>(); var results = new List<HealthCheck>();
@ -93,7 +93,10 @@ namespace NzbDrone.Core.HealthCheck
} }
} }
results.AddRange(_serverSideNotificationService.GetServerChecks()); if (performServerChecks)
{
results.AddRange(_serverSideNotificationService.GetServerChecks());
}
foreach (var result in results) foreach (var result in results)
{ {
@ -119,17 +122,17 @@ namespace NzbDrone.Core.HealthCheck
{ {
if (message.Trigger == CommandTrigger.Manual) if (message.Trigger == CommandTrigger.Manual)
{ {
PerformHealthCheck(_healthChecks); PerformHealthCheck(_healthChecks, null, true);
} }
else else
{ {
PerformHealthCheck(_scheduledHealthChecks); PerformHealthCheck(_scheduledHealthChecks, null, true);
} }
} }
public void HandleAsync(ApplicationStartedEvent message) public void HandleAsync(ApplicationStartedEvent message)
{ {
PerformHealthCheck(_startupHealthChecks); PerformHealthCheck(_startupHealthChecks, null, true);
} }
public void HandleAsync(IEvent message) public void HandleAsync(IEvent message)

30
src/NzbDrone.Core/HealthCheck/ServerSideNotificationService.cs
View file

@ -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,24 +24,37 @@ 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, ILidarrCloudRequestBuilder cloudRequestBuilder, Logger logger) private readonly ICached<List<HealthCheck>> _cache;
public ServerSideNotificationService(IHttpClient client,
IConfigFileProvider configFileProvider,
ILidarrCloudRequestBuilder 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")
.AddQueryParam("version", BuildInfo.Version) .AddQueryParam("version", BuildInfo.Version)
.AddQueryParam("os", OsInfo.Os.ToString().ToLowerInvariant()) .AddQueryParam("os", OsInfo.Os.ToString().ToLowerInvariant())
.AddQueryParam("arch", RuntimeInformation.OSArchitecture) .AddQueryParam("arch", RuntimeInformation.OSArchitecture)
.AddQueryParam("runtime", PlatformInfo.Platform.ToString().ToLowerInvariant()) .AddQueryParam("runtime", PlatformInfo.Platform.ToString().ToLowerInvariant())
.AddQueryParam("branch", _configFileProvider.Branch) .AddQueryParam("branch", _configFileProvider.Branch)
.Build(); .Build();
try try
{ {
_logger.Trace("Getting server side health notifications"); _logger.Trace("Getting server side health notifications");