Merge pull request #5 from Kyomotoi/main

sync main

2 files changed, 25 insertions, 13 deletions

diff --git a/ATRI/plugins/status/__init__.py b/ATRI/plugins/status/__init__.py
index 3e18e1d..05ece79 100644
--- a/ATRI/plugins/status/__init__.py
+++ b/ATRI/plugins/status/__init__.py
@@ -22,8 +22,8 @@ async def _status():
 info_msg = "アトリは高性能ですから！"
 
 
[email protected]_job("interval", name="状态检查", minutes=10, misfire_grace_time=15)
-async def _status_checking():
[email protected]_job("interval", name="状态检查", minutes=10, misfire_grace_time=15)  # type: ignore
+async def _check_runtime():
     msg, stat = IsSurvive().get_status()
     if not stat:
         await status.finish(msg)
diff --git a/ATRI/plugins/status/data_source.py b/ATRI/plugins/status/data_source.py
index 74882de..3595c0c 100644
--- a/ATRI/plugins/status/data_source.py
+++ b/ATRI/plugins/status/data_source.py
@@ -8,12 +8,24 @@ from ATRI.rule import is_in_service
 from ATRI.exceptions import GetStatusError
 
 
-__doc__ = "检查咱自身状态"
+_status_msg = """
+> Status Overview
+
+[CPU: {cpu}%]
+[Memory: {mem}%]
+[Disk usage: {disk}%]
+
+[Net sent: {inteSENT}MB]
+[Net recv: {inteRECV}MB]
+
+[Runtime: {up_time}]
+{msg}
+""".strip()
 
 
 class IsSurvive(Service):
     def __init__(self):
-        Service.__init__(self, "状态", __doc__, rule=is_in_service("状态"))
+        Service.__init__(self, "状态", "检查自身状态", rule=is_in_service("状态"))
 
     @staticmethod
     def ping() -> str:
@@ -55,14 +67,14 @@ class IsSurvive(Service):
             log.info("资源占用正常")
             is_ok = True
 
-        msg0 = (
-            "Self status:\n"
-            f"* CPU: {cpu}%\n"
-            f"* MEM: {mem}%\n"
-            f"* DISK: {disk}%\n"
-            f"* netSENT: {inteSENT}MB\n"
-            f"* netRECV: {inteRECV}MB\n"
-            f"* Runtime: {up_time}\n"
-        ) + msg
+        msg0 = _status_msg.format(
+            cpu=cpu,
+            mem=mem,
+            disk=disk,
+            inteSENT=inteSENT,
+            inteRECV=inteRECV,
+            up_time=up_time,
+            msg=msg,
+        )
 
         return msg0, is_ok