From 63cc80b23473d12e84fcc32cfd2e392a83174009 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Luk=C3=A1=C5=A1=20Ondr=C3=A1=C4=8Dek?= Date: Tue, 2 Apr 2024 17:27:24 +0200 Subject: [PATCH] fixup! fixup! rrl: configurable limits in yaml, deinit --- .../datamodel/rate_limiting_schema.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/manager/knot_resolver_manager/datamodel/rate_limiting_schema.py b/manager/knot_resolver_manager/datamodel/rate_limiting_schema.py index c38727ff0..20706aa50 100644 --- a/manager/knot_resolver_manager/datamodel/rate_limiting_schema.py +++ b/manager/knot_resolver_manager/datamodel/rate_limiting_schema.py @@ -1,7 +1,6 @@ -#from typing_extensions import Literal - from knot_resolver_manager.utils.modeling import ConfigSchema + class RateLimitingSchema(ConfigSchema): """ Configuration of rate limiting. @@ -17,10 +16,10 @@ class RateLimitingSchema(ConfigSchema): instant_limit: int = 50 def _validate(self) -> None: - max_instant_limit = int(2 ** 32 / 768 - 1); + max_instant_limit = int(2**32 / 768 - 1) if not 1 <= self.instant_limit <= max_instant_limit: raise ValueError(f"'instant-limit' should be in range 1..{max_instant_limit}") if not 1 <= self.rate_limit <= 1000 * self.instant_limit: - raise ValueError(f"'rate-limit' should be in range 1..(1000 * instant-limit)") - if not 0 < self.capacity: - raise ValueError(f"'capacity' should be positive") + raise ValueError("'rate-limit' should be in range 1..(1000 * instant-limit)") + if self.capacity <= 0: + raise ValueError("'capacity' should be positive") -- 2.47.2