automatic choosing journald services

configs/kvmd/platforms/kvmd.v1-hdmi.yaml

@@ -10,11 +10,6 @@ kvmd:
     info:
         meta: /etc/kvmd/meta.yaml
 
-    log:
-        services:
-            - kvmd.service
-            - kvmd-tc358743.service
-
     hid:
         pinout:
             reset: 4

configs/kvmd/platforms/kvmd.v1-vga.yaml

@@ -10,11 +10,6 @@ kvmd:
     info:
         meta: /etc/kvmd/meta.yaml
 
-    log:
-        services:
-            - kvmd.service
-            - kvmd-tc358743.service
-
     hid:
         pinout:
             reset: 4

kvmd/apps/kvmd/__init__.py

@@ -22,10 +22,7 @@ def main() -> None:
         loop = asyncio.get_event_loop()
         http_session = aiohttp.ClientSession(loop=loop)
 
-        log = Log(
+        log = Log(loop)
-            services=list(config["log"]["services"]),
-            loop=loop,
-        )
 
         hid = Hid(
             reset=int(config["hid"]["pinout"]["reset"]),

kvmd/logging.py

@@ -1,9 +1,9 @@
 import sys
+import re
 import asyncio
 import logging
 import time
 
-from typing import List
 from typing import Dict
 from typing import AsyncGenerator
 
@@ -24,13 +24,7 @@ def get_logger(depth: int=1) -> logging.Logger:
 
 
 class Log:
-    def __init__(
+    def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
-        self,
-        services: List[str],
-        loop: asyncio.AbstractEventLoop,
-    ) -> None:
-
-        self.__services = services
         self.__loop = loop
 
     async def poll_log(self, seek: int, follow: bool) -> AsyncGenerator[Dict, None]:
@@ -38,7 +32,14 @@ class Log:
         reader.this_boot()
         reader.this_machine()
         reader.log_level(systemd.journal.LOG_DEBUG)
-        for service in self.__services:
+
+        services = set(
+            service
+            for service in systemd.journal.Reader().query_unique("_SYSTEMD_UNIT")
+            if re.match(r"kvmd(-\w+)?\.service", service)
+        ).union(["kvmd.service"])
+
+        for service in services:
             reader.add_match(_SYSTEMD_UNIT=service)
         if seek > 0:
             reader.seek_realtime(float(time.time() - seek))

testenv/kvmd.yaml

@@ -7,10 +7,6 @@ kvmd:
     info:
         meta: /etc/kvmd/meta.yaml
 
-    log:
-        services:
-            - kvmd.service
-
     hid:
         pinout:
             reset: 4