From: Aleš Mrázek Date: Wed, 5 Jun 2024 15:40:16 +0000 (+0200) Subject: manager: config_store: only_on_real_changes renamed to only_on_real_changes_update X-Git-Tag: v6.0.8~8^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e5bb0a9e9f4b92936a0e9e60a3854405769b2c3;p=thirdparty%2Fknot-resolver.git manager: config_store: only_on_real_changes renamed to only_on_real_changes_update --- diff --git a/manager/knot_resolver_manager/config_store.py b/manager/knot_resolver_manager/config_store.py index 7c3b7ba95..b4e2d62c8 100644 --- a/manager/knot_resolver_manager/config_store.py +++ b/manager/knot_resolver_manager/config_store.py @@ -57,12 +57,12 @@ class ConfigStore: return self._config -def only_on_real_changes(selector: Callable[[KresConfig], Any]) -> Callable[[UpdateCallback], UpdateCallback]: +def only_on_real_changes_update(selector: Callable[[KresConfig], Any]) -> Callable[[UpdateCallback], UpdateCallback]: def decorator(orig_func: UpdateCallback) -> UpdateCallback: original_value_set: Any = False original_value: Any = None - async def new_func(config: KresConfig) -> None: + async def new_func_update(config: KresConfig) -> None: nonlocal original_value_set nonlocal original_value if not original_value_set: @@ -73,7 +73,7 @@ def only_on_real_changes(selector: Callable[[KresConfig], Any]) -> Callable[[Upd original_value = selector(config) await orig_func(config) - return new_func + return new_func_update return decorator diff --git a/manager/knot_resolver_manager/kres_manager.py b/manager/knot_resolver_manager/kres_manager.py index 5c4f865ce..9499e7cb7 100644 --- a/manager/knot_resolver_manager/kres_manager.py +++ b/manager/knot_resolver_manager/kres_manager.py @@ -6,7 +6,7 @@ from subprocess import SubprocessError from typing import Any, Callable, List, Optional from knot_resolver_manager.compat.asyncio import create_task -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes, only_on_real_changes_verifier +from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update, only_on_real_changes_verifier from knot_resolver_manager.constants import ( FIX_COUNTER_DECREASE_INTERVAL_SEC, MANAGER_FIX_ATTEMPT_MAX_COUNTER, @@ -116,7 +116,7 @@ class KresManager: # pylint: disable=too-many-instance-attributes # register and immediately call a callback that applies policy rules configuration await config_store.register_on_change_callback( - only_on_real_changes(lambda config: [config.views, config.local_data, config.forward])( + only_on_real_changes_update(lambda config: [config.views, config.local_data, config.forward])( self.apply_policy_rules_config ) ) @@ -144,7 +144,7 @@ class KresManager: # pylint: disable=too-many-instance-attributes await config_store.register_verifier(only_on_real_changes_verifier(config_nodes)(self.validate_config)) # register and immediately call a callback to apply config to all 'kresd' workers and 'cache-gc' - await config_store.register_on_change_callback(only_on_real_changes(config_nodes)(self.apply_config)) + await config_store.register_on_change_callback(only_on_real_changes_update(config_nodes)(self.apply_config)) # register controller config change listeners await config_store.register_verifier(_deny_max_worker_changes) diff --git a/manager/knot_resolver_manager/log.py b/manager/knot_resolver_manager/log.py index 08da675b4..19271c526 100644 --- a/manager/knot_resolver_manager/log.py +++ b/manager/knot_resolver_manager/log.py @@ -4,7 +4,7 @@ import os import sys from typing import Optional -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes +from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update from knot_resolver_manager.constants import STARTUP_LOG_LEVEL from knot_resolver_manager.datamodel.config_schema import KresConfig from knot_resolver_manager.datamodel.logging_schema import LogTargetEnum @@ -88,7 +88,7 @@ async def _set_logging_handler(config: KresConfig) -> None: root.addHandler(handler) -@only_on_real_changes(lambda config: config.logging) +@only_on_real_changes_update(lambda config: config.logging) async def _configure_logger(config: KresConfig) -> None: await _set_logging_handler(config) await _set_log_level(config) diff --git a/manager/knot_resolver_manager/statistics.py b/manager/knot_resolver_manager/statistics.py index 0dcfdac08..4a0eb783a 100644 --- a/manager/knot_resolver_manager/statistics.py +++ b/manager/knot_resolver_manager/statistics.py @@ -5,7 +5,7 @@ import logging from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Tuple from knot_resolver_manager import compat -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes +from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update from knot_resolver_manager.datamodel.config_schema import KresConfig from knot_resolver_manager.kresd_controller.registered_workers import ( command_registered_workers, @@ -250,7 +250,7 @@ if _prometheus_support: _graphite_bridge: Optional[GraphiteBridge] = None - @only_on_real_changes(lambda c: c.monitoring.graphite) + @only_on_real_changes_update(lambda c: c.monitoring.graphite) async def _configure_graphite_bridge(config: KresConfig) -> None: """ Starts graphite bridge if required diff --git a/manager/tests/unit/test_config_store.py b/manager/tests/unit/test_config_store.py index 9b843bb92..f4fd8c035 100644 --- a/manager/tests/unit/test_config_store.py +++ b/manager/tests/unit/test_config_store.py @@ -1,6 +1,6 @@ import pytest -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes +from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update from knot_resolver_manager.datamodel.config_schema import KresConfig @@ -8,7 +8,7 @@ from knot_resolver_manager.datamodel.config_schema import KresConfig async def test_only_once(): count = 0 - @only_on_real_changes(lambda config: config.logging.level) + @only_on_real_changes_update(lambda config: config.logging.level) async def change_callback(config: KresConfig) -> None: nonlocal count count += 1