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: (Flaresolverr) Proxy Test

Browse Source 
Fixes #651
This commit is contained in:
Qstick
2021-11-29 21:00:38 -06:00
parent 5f5df99dab
commit 01e7e924c4
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs
View File

@@ -149,7 +149,7 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
{ {
var failures = new List<ValidationFailure>(); var failures = new List<ValidationFailure>();
var request = PreRequest(_cloudRequestBuilder.Create() var request = GenerateFlareSolverrRequest(_cloudRequestBuilder.Create()
.Resource("/ping") .Resource("/ping")
.Build()); .Build());
@@ -157,12 +157,13 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
{ {
var response = _httpClient.Execute(request); var response = _httpClient.Execute(request);
// We only care about 400 responses, other error codes can be ignored if (response.StatusCode != HttpStatusCode.OK)
if (response.StatusCode == HttpStatusCode.BadRequest)
{ {
_logger.Error("Proxy Health Check failed: {0}", response.StatusCode); _logger.Error("Proxy Health Check failed: {0}", response.StatusCode);
failures.Add(new NzbDroneValidationFailure("Host", string.Format(_localizationService.GetLocalizedString("ProxyCheckBadRequestMessage"), response.StatusCode))); failures.Add(new NzbDroneValidationFailure("Host", string.Format(_localizationService.GetLocalizedString("ProxyCheckBadRequestMessage"), response.StatusCode)));
} }
var result = JsonConvert.DeserializeObject<FlareSolverrResponse>(response.Content);
} }
catch (Exception ex) catch (Exception ex)
{ {

8
src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs
View File

@@ -31,12 +31,6 @@ namespace NzbDrone.Core.IndexerProxies
{ {
var failures = new List<ValidationFailure>(); var failures = new List<ValidationFailure>();
var addresses = Dns.GetHostAddresses(Settings.Host);
if (!addresses.Any())
{
failures.Add(new NzbDroneValidationFailure("Host", string.Format(_localizationService.GetLocalizedString("ProxyCheckResolveIpMessage"), addresses)));
}
var request = PreRequest(_cloudRequestBuilder.Create() var request = PreRequest(_cloudRequestBuilder.Create()
.Resource("/ping") .Resource("/ping")
.Build()); .Build());
@@ -55,7 +49,7 @@ namespace NzbDrone.Core.IndexerProxies
catch (Exception ex) catch (Exception ex)
{ {
_logger.Error(ex, "Proxy Health Check failed"); _logger.Error(ex, "Proxy Health Check failed");
failures.Add(new NzbDroneValidationFailure("Host", string.Format("Failed to test proxy: {0}", request.Url))); failures.Add(new NzbDroneValidationFailure("Host", string.Format("Failed to test proxy: {0}", ex.Message)));
} }
return new ValidationResult(failures); return new ValidationResult(failures);