适应的 docker 修改

kvmd/apps/kvmd/api/log.py

@@ -53,10 +53,14 @@ class LogApi:
         seek = valid_log_seek(request.query.get("seek", 0))
         follow = valid_bool(request.query.get("follow", False))
         response = await start_streaming(request, "text/plain")
-        async for record in self.__log_reader.poll_log(seek, follow):
-            await response.write(("[%s %s] --- %s" % (
-                record["dt"].strftime("%Y-%m-%d %H:%M:%S"),
-                record["service"],
-                record["msg"],
-            )).encode("utf-8") + b"\r\n")
+        try:
+            async for record in self.__log_reader.poll_log(seek, follow):
+                await response.write(("[%s %s] --- %s" % (
+                    record["dt"].strftime("%Y-%m-%d %H:%M:%S"),
+                    record["service"],
+                    record["msg"],
+                )).encode("utf-8") + b"\r\n")
+        except Exception as e:
+            await response.write(f"Module systemd.journal unavailable, switch to supervisord.\n{record}".encode("utf-8"))
+            return response
         return response

kvmd/apps/kvmd/info/hw.py

@@ -111,10 +111,12 @@ class HwInfoSubmanager(BaseInfoSubmanager):
     async def __read_dt_file(self, name: str) -> (str | None):
         if name not in self.__dt_cache:
             path = os.path.join(f"{env.PROCFS_PREFIX}/proc/device-tree", name)
+            if not os.path.exists(path):
+                path = os.path.join(f"{env.PROCFS_PREFIX}/usr/share/kvmd/extras/hw_info/", name)
             try:
                 self.__dt_cache[name] = (await aiotools.read_file(path)).strip(" \t\r\n\0")
             except Exception as err:
-                get_logger(0).error("Can't read DT %s from %s: %s", name, path, err)
+                get_logger(0).warn("Can't read DT %s from %s: %s", name, path, err)
                 return None
         return self.__dt_cache[name]
 
@@ -141,7 +143,7 @@ class HwInfoSubmanager(BaseInfoSubmanager):
         try:
             return int((await aiotools.read_file(temp_path)).strip()) / 1000
         except Exception as err:
-            get_logger(0).error("Can't read CPU temp from %s: %s", temp_path, err)
+            get_logger(0).warn("Can't read CPU temp from %s: %s", temp_path, err)
             return None
 
     async def __get_cpu_percent(self) -> (float | None):

kvmd/apps/kvmd/logreader.py

@@ -25,39 +25,51 @@ import asyncio
 import time
 
 from typing import AsyncGenerator
+from xmlrpc.client import ServerProxy
 
-import systemd.journal
+from ...logging import get_logger
 
+try:
+    module_name = "systemd.journal"
+    module = __import__(module_name)
+except ImportError:
+    us_systemd_journal = False
+    get_logger(0).error("Failed to import module: %s", module_name)
 
 # =====
 class LogReader:
     async def poll_log(self, seek: int, follow: bool) -> AsyncGenerator[dict, None]:
-        reader = systemd.journal.Reader()
-        reader.this_boot()
-        # XXX: Из-за смены ID машины в bootconfig это не работает при первой загрузке.
-        # reader.this_machine()
-        reader.log_level(systemd.journal.LOG_DEBUG)
+        if us_systemd_journal:
+            reader = systemd.journal.Reader() # type: ignore
+            reader.this_boot()
+            # XXX: Из-за смены ID машины в bootconfig это не работает при первой загрузке.
+            # reader.this_machine()
+            reader.log_level(systemd.journal.LOG_DEBUG) # type: ignore
+            services = set(
+                service
+                for service in systemd.journal.Reader().query_unique("_SYSTEMD_UNIT") # type: ignore
+                if re.match(r"kvmd(-\w+)*\.service", service)
+            ).union(["kvmd.service"])
 
-        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))
 
-        for service in services:
-            reader.add_match(_SYSTEMD_UNIT=service)
-        if seek > 0:
-            reader.seek_realtime(float(time.time() - seek))
-
-        for entry in reader:
-            yield self.__entry_to_record(entry)
-
-        while follow:
-            entry = reader.get_next()
-            if entry:
+            for entry in reader:
                 yield self.__entry_to_record(entry)
-            else:
-                await asyncio.sleep(1)
+
+            while follow:
+                entry = reader.get_next()
+                if entry:
+                    yield self.__entry_to_record(entry)
+                else:
+                    await asyncio.sleep(1)
+        else:
+            server = ServerProxy('http://127.0.0.1:9001/RPC2')
+            log_entries = server.supervisor.readLog(0,0)
+            yield log_entries
+            
 
     def __entry_to_record(self, entry: dict) -> dict[str, dict]:
         return {