diff --git a/src/apps/parsers/tasks.py b/src/apps/parsers/tasks.py index eb69387..d0ccf03 100644 --- a/src/apps/parsers/tasks.py +++ b/src/apps/parsers/tasks.py @@ -34,7 +34,6 @@ from apps.parsers.services import ( ProxyToolsSyncService, ) from celery import shared_task -from django.conf import settings from requests.adapters import BaseAdapter logger = logging.getLogger(__name__) @@ -50,8 +49,7 @@ def _resolve_proxies(proxies: list[str] | None) -> list[str] | None: Приоритет: 1. Явно переданные в задачу `proxies` - 2. Активные прокси из БД - 3. `settings.PARSER_PROXIES` (например, из ENV) + 2. Runtime-прокси из БД (с приоритетом Proxy-Tools RU) """ if proxies is not None: return proxies @@ -60,8 +58,7 @@ def _resolve_proxies(proxies: list[str] | None) -> list[str] | None: if db_proxies: return db_proxies - configured_proxies = getattr(settings, "PARSER_PROXIES", []) or [] - return configured_proxies or None + return None def _get_or_create_background_job( diff --git a/tests/apps/parsers/test_tasks.py b/tests/apps/parsers/test_tasks.py index 11fc666..f8e3f5e 100644 --- a/tests/apps/parsers/test_tasks.py +++ b/tests/apps/parsers/test_tasks.py @@ -129,10 +129,10 @@ class ProxyResolutionTestCase(TestCase): self.assertEqual(result, [imported_proxy.address]) @override_settings(PARSER_PROXIES=["http://env-proxy:8080"]) - def test_resolve_proxies_falls_back_to_settings_when_db_empty(self): + def test_resolve_proxies_does_not_use_unclassified_env_fallback(self): result = _resolve_proxies(None) - self.assertEqual(result, ["http://env-proxy:8080"]) + self.assertIsNone(result) class SyncRuProxiesTaskTestCase(TestCase):