From: Vasek Sraier <git@vakabus.cz>
Date: Sun, 17 Apr 2022 15:11:39 +0000 (+0200)
Subject: manager: improved logging of subprocess controller selection
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a4c05bcdbe7ddf71a8a8caca9f35fac4e82288d;p=thirdparty%2Fknot-resolver.git

manager: improved logging of subprocess controller selection
---

diff --git a/manager/knot_resolver_manager/kresd_controller/__init__.py b/manager/knot_resolver_manager/kresd_controller/__init__.py
index c42169bc3..c2604fa11 100644
--- a/manager/knot_resolver_manager/kresd_controller/__init__.py
+++ b/manager/knot_resolver_manager/kresd_controller/__init__.py
@@ -51,7 +51,7 @@ def try_systemd():
 
 
 async def get_best_controller_implementation(config: KresConfig) -> SubprocessController:
-    logger.debug("Starting service manager auto-selection...")
+    logger.info("Starting service manager auto-selection...")
 
     if len(_registered_controllers) == 0:
         logger.error("No controllers are available! Did you install all dependencies?")
@@ -59,6 +59,10 @@ async def get_best_controller_implementation(config: KresConfig) -> SubprocessCo
 
     # check all controllers concurrently
     res = await asyncio.gather(*(cont.is_controller_available(config) for cont in _registered_controllers))
+    logger.info(
+        "Available subprocess controllers are %s",
+        str(tuple((str(c) for r, c in zip(res, _registered_controllers) if r))),
+    )
 
     # take the first one on the list which is available
     for avail, controller in zip(res, _registered_controllers):
diff --git a/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py b/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py
index a5550accc..b0070b428 100644
--- a/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py
+++ b/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py
@@ -109,7 +109,7 @@ class SystemdSubprocessController(SubprocessController):
         cmd = f"systemctl {'--user' if self._systemd_type == SystemdType.SESSION else ''} status"
         ret = await call(cmd, shell=True, discard_output=True)
         if ret != 0:
-            logger.info(
+            logger.debug(
                 "Calling '%s' failed. Assumming systemd (%s) is not running/installed.", cmd, self._systemd_type
             )
             return False
@@ -117,7 +117,7 @@ class SystemdSubprocessController(SubprocessController):
         # check that we run under root for non-session systemd
         try:
             if self._systemd_type is SystemdType.SYSTEM and os.geteuid() != 0:
-                logger.info(
+                logger.debug(
                     "Systemd (%s) looks functional, but we are not running as root. Assuming not enough privileges",
                     self._systemd_type,
                 )
@@ -125,7 +125,7 @@ class SystemdSubprocessController(SubprocessController):
 
             return True
         except BaseException:  # we want every possible exception to be caught
-            logger.warning("Communicating with systemd DBus API failed", exc_info=True)
+            logger.warning("Systemd autodetection error: communicating with systemd DBus API failed", exc_info=True)
             return False
 
     async def get_all_running_instances(self) -> Iterable[Subprocess]: