manager: logging: improved formatting

diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py b/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py
index 872ef6d7424b3e735c588751176af3776d2f098d..89691732b9c07b8ffdb3adfbddeb5180eb1e6816 100644 (file)
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py
+++ b/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py
@@ -1,6 +1,7 @@
 # type: ignore
 # pylint: disable=protected-access
 
+import os
 import sys
 import traceback
 from typing import Any
@@ -32,8 +33,13 @@ def POutputDispatcher_log(self: POutputDispatcher, data: bytearray):
         config = self.process.config
         config.options.logger.handlers = forward_handlers
         for line in text.splitlines():
-            msg = "[%(name)s:%(channel)s] %(data)s"
-            config.options.logger.log(FORWARD_LOG_LEVEL, msg, name=config.name, channel=self.channel[3:], data=line)
+            msg = "%(name)s[%(pid)d]%(stream)s: %(data)s"
+            stream = ""
+            if self.channel == "stderr":
+                stream = " (stderr)"
+            config.options.logger.log(
+                FORWARD_LOG_LEVEL, msg, name=config.name, stream=stream, data=line, pid=self.process.pid
+            )
         config.options.logger.handlers = supervisord_handlers
 
 
@@ -57,13 +63,13 @@ def inject(supervisord: Supervisor, **config: Any) -> Any:  # pylint: disable=us
         supervisord.options.logger.info("reconfiguring log handlers")
         supervisord_handlers.append(
             _create_handler(
-                "[%(asctime)s][supervisor] [%(levelname)s] %(message)s\n",
+                f"%(asctime)s supervisor[{os.getpid()}]: [%(levelname)s] %(message)s\n",
                 supervisord.options.loglevel,
                 config["target"],
             )
         )
         forward_handlers.append(
-            _create_handler("[%(asctime)s]%(message)s\n", supervisord.options.loglevel, config["target"])
+            _create_handler("%(asctime)s %(message)s\n", supervisord.options.loglevel, config["target"])
         )
         supervisord.options.logger.handlers = supervisord_handlers
 

diff --git a/manager/knot_resolver_manager/log.py b/manager/knot_resolver_manager/log.py
index 7d3c0ae58a41c599b552888dea8297b3b2744d08..08da675b48cd2b7686e2a20b93a0fd604f8cd4f1 100644 (file)
--- a/manager/knot_resolver_manager/log.py
+++ b/manager/knot_resolver_manager/log.py
@@ -24,8 +24,12 @@ def get_log_format(config: KresConfig) -> str:
         # In this case, we are running standalone during inicialization and we need to add a prefix to each line
         # by ourselves to make it consistent
         assert config.logging.target != "syslog"
-        channel = config.logging.target[3:]
-        return f"[%(asctime)s][manager:{channel}] [%(levelname)s] %(name)s: %(message)s"
+        stream = ""
+        if config.logging.target == "stderr":
+            stream = " (stderr)"
+
+        pid = os.getpid()
+        return f"%(asctime)s manager[{pid}]{stream}: [%(levelname)s] %(name)s: %(message)s"
 
 
 async def _set_log_level(config: KresConfig) -> None: