shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Proxy HealthCheck should use Proxy.Test method

Browse Source 
Fixes #431
This commit is contained in:
Qstick
2021-08-17 07:45:20 -04:00
parent 891ca0f56b
commit 4a957b618e
1 changed files with 3 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/NzbDrone.Core/HealthCheck/Checks/IndexerProxyCheck.cs
View File

@@ -1,10 +1,5 @@
using System;
using System.Linq; using System.Linq;
using System.Net;
using NLog;
using NzbDrone.Common.Cloud;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Core.IndexerProxies; using NzbDrone.Core.IndexerProxies;
using NzbDrone.Core.Localization; using NzbDrone.Core.Localization;
using NzbDrone.Core.ThingiProvider.Events; using NzbDrone.Core.ThingiProvider.Events;
@@ -16,30 +11,20 @@ namespace NzbDrone.Core.HealthCheck.Checks
[CheckOn(typeof(ProviderUpdatedEvent<IIndexerProxy>))] [CheckOn(typeof(ProviderUpdatedEvent<IIndexerProxy>))]
public class IndexerProxyCheck : HealthCheckBase public class IndexerProxyCheck : HealthCheckBase
{ {
private readonly Logger _logger;
private readonly IIndexerProxyFactory _proxyFactory; private readonly IIndexerProxyFactory _proxyFactory;
private readonly IHttpClient _client;
private readonly IHttpRequestBuilderFactory _cloudRequestBuilder; public IndexerProxyCheck(IIndexerProxyFactory proxyFactory,
ILocalizationService localizationService)
public IndexerProxyCheck(IProwlarrCloudRequestBuilder cloudRequestBuilder,
IHttpClient client,
IIndexerProxyFactory proxyFactory,
ILocalizationService localizationService,
Logger logger)
: base(localizationService) : base(localizationService)
{ {
_proxyFactory = proxyFactory; _proxyFactory = proxyFactory;
_cloudRequestBuilder = cloudRequestBuilder.Services;
_logger = logger;
_client = client;
} }
public override HealthCheck Check() public override HealthCheck Check()
{ {
var enabledProviders = _proxyFactory.GetAvailableProviders(); var enabledProviders = _proxyFactory.GetAvailableProviders();
var badProxies = enabledProviders.Where(p => !IsProxyWorking(p)).ToList(); var badProxies = enabledProviders.Where(p => p.Test().IsValid == false).ToList();
if (enabledProviders.Empty() || badProxies.Count == 0) if (enabledProviders.Empty() || badProxies.Count == 0)
{ {
@@ -60,37 +45,5 @@ namespace NzbDrone.Core.HealthCheck.Checks
string.Join(", ", badProxies.Select(v => v.Definition.Name))), string.Join(", ", badProxies.Select(v => v.Definition.Name))),
"#proxies-are-unavailable-due-to-failures"); "#proxies-are-unavailable-due-to-failures");
} }
private bool IsProxyWorking(IIndexerProxy indexerProxy)
{
var request = _cloudRequestBuilder.Create()
.Resource("/ping")
.Build();
try
{
var addresses = Dns.GetHostAddresses(((IIndexerProxySettings)indexerProxy.Definition.Settings).Host);
if (!addresses.Any())
{
return false;
}
var response = _client.Execute(request);
// We only care about 400 responses, other error codes can be ignored
if (response.StatusCode == HttpStatusCode.BadRequest)
{
_logger.Error("Proxy Health Check failed: {0}", response.StatusCode);
return false;
}
}
catch (Exception ex)
{
_logger.Error(ex, "Proxy Health Check failed");
return false;
}
return true;
}
} }
} }