From 136075d2330e3a12bab539d16e9fdf2a88e28200 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 27 Jul 2023 06:38:03 +0300 Subject: [PATCH] Fixed: Check only enabled indexers in IndexerJackettAll health check --- .../HealthCheck/Checks/IndexerJackettAllCheckFixture.cs | 1 + .../HealthCheck/Checks/IndexerJackettAllCheck.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs index 6cbe0934e3..5e32b8c7c1 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs @@ -38,6 +38,7 @@ private void GivenIndexer(string baseUrl, string apiPath) _definition = new IndexerDefinition { Name = "Indexer", + EnableRss = true, ConfigContract = "TorznabSettings", Settings = torznabSettings }; diff --git a/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs index 35340a15a2..ecfd9aacf9 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs @@ -8,6 +8,7 @@ namespace NzbDrone.Core.HealthCheck.Checks { + [CheckOn(typeof(ProviderAddedEvent))] [CheckOn(typeof(ProviderUpdatedEvent))] [CheckOn(typeof(ProviderDeletedEvent))] [CheckOn(typeof(ProviderStatusChangedEvent))] @@ -25,7 +26,8 @@ public override HealthCheck Check() { var jackettAllProviders = _providerFactory.All() .Where( - i => i.ConfigContract.Equals("TorznabSettings") && + i => i.Enable && + i.ConfigContract.Equals("TorznabSettings") && (((TorznabSettings)i.Settings).BaseUrl.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) || ((TorznabSettings)i.Settings).BaseUrl.Contains("/api/v2.0/indexers/all/results/torznab", StringComparison.InvariantCultureIgnoreCase) || ((TorznabSettings)i.Settings).ApiPath.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) ||