From: Aleš Mrázek Date: Wed, 29 Jan 2025 09:47:05 +0000 (+0100) Subject: python: formatting improvements X-Git-Tag: v6.0.11~7^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8920c2141bbe28e634e348d61c195084c5d148a;p=thirdparty%2Fknot-resolver.git python: formatting improvements --- diff --git a/python/knot_resolver/datamodel/config_schema.py b/python/knot_resolver/datamodel/config_schema.py index 6329add37..410e94d7c 100644 --- a/python/knot_resolver/datamodel/config_schema.py +++ b/python/knot_resolver/datamodel/config_schema.py @@ -5,6 +5,7 @@ from typing import Any, Dict, List, Literal, Optional, Tuple, Union from knot_resolver.constants import API_SOCK_FILE, RUN_DIR, VERSION from knot_resolver.datamodel.cache_schema import CacheSchema +from knot_resolver.datamodel.defer_schema import DeferSchema from knot_resolver.datamodel.dns64_schema import Dns64Schema from knot_resolver.datamodel.dnssec_schema import DnssecSchema from knot_resolver.datamodel.forward_schema import ForwardSchema @@ -17,7 +18,6 @@ from knot_resolver.datamodel.monitoring_schema import MonitoringSchema from knot_resolver.datamodel.network_schema import NetworkSchema from knot_resolver.datamodel.options_schema import OptionsSchema from knot_resolver.datamodel.rate_limiting_schema import RateLimitingSchema -from knot_resolver.datamodel.defer_schema import DeferSchema from knot_resolver.datamodel.templates import POLICY_CONFIG_TEMPLATE, WORKER_CONFIG_TEMPLATE from knot_resolver.datamodel.types import EscapedStr, IntPositive, WritableDir from knot_resolver.datamodel.view_schema import ViewSchema diff --git a/python/knot_resolver/datamodel/defer_schema.py b/python/knot_resolver/datamodel/defer_schema.py index 38301e55f..81546a075 100644 --- a/python/knot_resolver/datamodel/defer_schema.py +++ b/python/knot_resolver/datamodel/defer_schema.py @@ -1,5 +1,5 @@ -from knot_resolver.utils.modeling import ConfigSchema from knot_resolver.datamodel.types import TimeUnit +from knot_resolver.utils.modeling import ConfigSchema class DeferSchema(ConfigSchema): diff --git a/python/knot_resolver/datamodel/rate_limiting_schema.py b/python/knot_resolver/datamodel/rate_limiting_schema.py index 60994c206..01771713c 100644 --- a/python/knot_resolver/datamodel/rate_limiting_schema.py +++ b/python/knot_resolver/datamodel/rate_limiting_schema.py @@ -27,7 +27,7 @@ class RateLimitingSchema(ConfigSchema): dry_run: bool = False def _validate(self) -> None: - max_instant_limit = int(2 ** 32 // 768 - 1) + max_instant_limit = int(2**32 // 768 - 1) if not int(self.instant_limit) <= max_instant_limit: raise ValueError(f"'instant-limit' has to be in range 1..{max_instant_limit}") if not int(self.rate_limit) <= 1000 * int(self.instant_limit): diff --git a/python/knot_resolver/datamodel/view_schema.py b/python/knot_resolver/datamodel/view_schema.py index 7afc042da..6d94b02af 100644 --- a/python/knot_resolver/datamodel/view_schema.py +++ b/python/knot_resolver/datamodel/view_schema.py @@ -1,7 +1,6 @@ from typing import List, Literal, Optional -from knot_resolver.datamodel.types import IDPattern, IPNetwork -from knot_resolver.datamodel.types import FloatNonNegative +from knot_resolver.datamodel.types import FloatNonNegative, IDPattern, IPNetwork from knot_resolver.utils.modeling import ConfigSchema diff --git a/python/knot_resolver/manager/manager.py b/python/knot_resolver/manager/manager.py index 48d9a9ecf..c26d95616 100644 --- a/python/knot_resolver/manager/manager.py +++ b/python/knot_resolver/manager/manager.py @@ -441,12 +441,12 @@ class KresManager: # pylint: disable=too-many-instance-attributes raise except BaseException: invoke_callback = True - logger.error("Knot Resolver watchdog failed with an unexpected exception.", exc_info=True) + logger.error("Knot Resolver processes watchdog failed with an unexpected exception.", exc_info=True) if invoke_callback: try: await self._instability_handler() except Exception: - logger.error("Watchdog failed while invoking instability callback", exc_info=True) + logger.error("Processes watchdog failed while invoking instability callback", exc_info=True) logger.error("Violently terminating!") sys.exit(1)