process management: GC was not stopped during graceful shutdown

fixes #45

diff --git a/manager/knot_resolver_manager/kres_manager.py b/manager/knot_resolver_manager/kres_manager.py
index c4205afc6d19e3689e9595ddcf25c22766823e20..1cc218b026e14ec3a152c77e469128a284e4e45e 100644 (file)
--- a/manager/knot_resolver_manager/kres_manager.py
+++ b/manager/knot_resolver_manager/kres_manager.py
@@ -160,6 +160,8 @@ class KresManager:
 
         async with self._manager_lock:
             await self._ensure_number_of_children(KresConfig(), 0)
+            if self._gc is not None:
+                await self._stop_gc()
             await self._controller.shutdown_controller()
 
     async def _instability_handler(self) -> None:

diff --git a/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py b/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py
index 8c6bfd33ac097d8116fcaef1a6bd266c675e49a7..64d5adef66972e746090bfc600732bbf5ec142eb 100644 (file)
--- a/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py
+++ b/manager/knot_resolver_manager/kresd_controller/systemd/__init__.py
@@ -40,13 +40,13 @@ class SystemdSubprocess(Subprocess):
     @property
     def systemd_id(self) -> str:
         if self._type is SubprocessType.GC:
-            return "kres-cache-gc.service"
+            return systemd.GC_SERVICE_NAME
         else:
             return f"kresd_{self._id}.service"
 
     @staticmethod
     def is_unit_name_ours(unit_name: str) -> bool:
-        is_ours = unit_name == "kres-cache-gc.service"
+        is_ours = unit_name == systemd.GC_SERVICE_NAME
         is_ours |= unit_name.startswith("kresd_") and unit_name.endswith(".service")
         return is_ours