From: Aleš <ales.mrazek@nic.cz>
Date: Tue, 6 Apr 2021 15:06:55 +0000 (+0200)
Subject: config: logging section added
X-Git-Tag: v6.0.0a1~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93ca70d4191dff16f0fa6232d8842af1abbca2e8;p=thirdparty%2Fknot-resolver.git

config: logging section added
---

diff --git a/manager/config/kres-manager.json b/manager/config/kres-manager.json
index 6446d3bdf..cc61b6f57 100644
--- a/manager/config/kres-manager.json
+++ b/manager/config/kres-manager.json
@@ -2,6 +2,12 @@
   "server": {
     "instances": 4
   },
+  "dns64": {
+    "prefix": "64:ff9b::/96"
+  },
+  "logging": {
+    "level": 4
+  },
   "lua": {
     "script": [
       "-- SPDX-License-Identifier: CC0-1.0",
diff --git a/manager/config/kres-manager.yaml b/manager/config/kres-manager.yaml
index df37edc9a..fe716ed35 100644
--- a/manager/config/kres-manager.yaml
+++ b/manager/config/kres-manager.yaml
@@ -4,6 +4,9 @@ server:
 dns64:
   prefix: "64:ff9b::/96"
 
+logging:
+  level: 4
+
 lua:
   script: |
     """
diff --git a/manager/config/kresd-template.j2 b/manager/config/kresd-template.j2
index 74241a1d1..57120b8b0 100644
--- a/manager/config/kresd-template.j2
+++ b/manager/config/kresd-template.j2
@@ -4,6 +4,11 @@ modules = {
 {%- endif %}
 }
 
+{%- if ( cfg.logging.level > 3 ) %}
+-- logging level
+verbose(true)
+{%- endif %}
+
 -- lua
 {%- if cfg.lua.script %}
 {{ cfg.lua.script }}
diff --git a/manager/integration/tests/basic_startup/payload.json b/manager/integration/tests/basic_startup/payload.json
index edc630918..f90aab733 100644
--- a/manager/integration/tests/basic_startup/payload.json
+++ b/manager/integration/tests/basic_startup/payload.json
@@ -5,6 +5,9 @@
   "dns64": {
     "prefix": "64:ff9b::/96"
   },
+  "logging": {
+    "level": 4
+  },
   "lua": {
     "script_list": [
       "-- SPDX-License-Identifier: CC0-1.0",
diff --git a/manager/knot_resolver_manager/configuration.py b/manager/knot_resolver_manager/configuration.py
index 4fb4871fd..dbb505d0f 100644
--- a/manager/knot_resolver_manager/configuration.py
+++ b/manager/knot_resolver_manager/configuration.py
@@ -11,6 +11,11 @@ modules = {
 {%- endif %}
 }
 
+{%- if ( cfg.logging.level > 3 ) %}
+-- logging level
+verbose(true)
+{%- endif %}
+
 -- lua
 {%- if cfg.lua.script %}
 {{ cfg.lua.script }}
diff --git a/manager/knot_resolver_manager/datamodel.py b/manager/knot_resolver_manager/datamodel.py
index f71633fcc..29bc71fb8 100644
--- a/manager/knot_resolver_manager/datamodel.py
+++ b/manager/knot_resolver_manager/datamodel.py
@@ -28,6 +28,15 @@ class Dns64Config(DataclassParserValidatorMixin):
             raise DataValidationError("'dns64.prefix' must be valid IPv6 address and '/96' CIDR")
 
 
+@dataclass
+class LoggingConfig(DataclassParserValidatorMixin):
+    level: int = 3
+
+    def validate(self):
+        if not 0 <= self.level <= 7:
+            raise DataValidationError("logging 'level' must be in range 0..7")
+
+
 @dataclass
 class LuaConfig(DataclassParserValidatorMixin):
     script_list: Optional[List[str]] = None
@@ -46,6 +55,7 @@ class LuaConfig(DataclassParserValidatorMixin):
 class KresConfig(DataclassParserValidatorMixin):
     server: ServerConfig = ServerConfig()
     dns64: Optional[Dns64Config] = None
+    logging: LoggingConfig = LoggingConfig()
     lua: LuaConfig = LuaConfig()
 
     def validate(self):