From 2e8917257e0d224c2bc8eeee9b016f02732eeb4d Mon Sep 17 00:00:00 2001
From: mofeng-git <mofeng654321@hotmail.com>
Date: Sat, 5 Oct 2024 05:59:08 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=20API=20?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kvmd/apps/kvmd/api/log.py   |  4 +++-
 kvmd/apps/kvmd/logreader.py | 16 +++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kvmd/apps/kvmd/api/log.py b/kvmd/apps/kvmd/api/log.py
index 7eb3204d..feab39a9 100644
--- a/kvmd/apps/kvmd/api/log.py
+++ b/kvmd/apps/kvmd/api/log.py
@@ -61,6 +61,8 @@ class LogApi:
                     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"))
+            if record is None:
+                record = e 
+            await response.write(f"Module systemd.journal is unavailable.\n{record}".encode("utf-8"))
             return response
         return response
diff --git a/kvmd/apps/kvmd/logreader.py b/kvmd/apps/kvmd/logreader.py
index c1c6c3de..5853189d 100644
--- a/kvmd/apps/kvmd/logreader.py
+++ b/kvmd/apps/kvmd/logreader.py
@@ -30,21 +30,19 @@ from xmlrpc.client import ServerProxy
 
 from ...logging import get_logger
 
-us_systemd_journal = True
-
 try:
-    module_name = "systemd.journal"
-    module = __import__(module_name)
-except ImportError:
+    import systemd.journal
+except ImportError as e:
+    get_logger(0).error("Failed to import module: %s", "systemd.journal")
     us_systemd_journal = False
-    get_logger(0).error("Failed to import module: %s", module_name)
 
 try:
-    module_name = "supervisor.xmlrpc"
-    module = __import__(module_name)
-except ImportError:
+    import supervisor.xmlrpc
+except ImportError as e:
+    get_logger(0).info("Failed to import module: %s", "supervisor.xmlrpc")
     us_systemd_journal = True
 
+
 # =====
 class LogReader:
     async def poll_log(self, seek: int, follow: bool) -> AsyncGenerator[dict, None]: