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 7c3b7ba950d490864b1d31a7d991076852e2f019..b4e2d62c899f1b9a46df04269cd0c4041132d2bd 100644 (file)
--- 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 5c4f865ce7ac3cd49ec3c61104150d51b65229df..9499e7cb7c14ec8b9c2e843e9799617558a85d6f 100644 (file)
--- 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 08da675b48cd2b7686e2a20b93a0fd604f8cd4f1..19271c52670db917f333b43fd4895e634bef69bf 100644 (file)
--- 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 0dcfdac0854b769831235c58f248a3b1d308fc88..4a0eb783a3043455d6b30fa4b8feb8510660ad28 100644 (file)
--- 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 9b843bb92f6ca9a19b1e816465834064a02a0c1c..f4fd8c0356fcbbb243f1b0420e5639969a2a98a1 100644 (file)
--- 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