From 8474e13ebb99f1115cf48041e39528327288c9d0 Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Sun, 27 Mar 2022 15:25:59 +0800 Subject: =?UTF-8?q?=F0=9F=9A=A8=20=E5=AE=89=E6=8A=9A=20pylance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/status/__init__.py | 2 +- ATRI/plugins/status/data_source.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'ATRI/plugins/status') diff --git a/ATRI/plugins/status/__init__.py b/ATRI/plugins/status/__init__.py index 3e18e1d..f62c86a 100644 --- a/ATRI/plugins/status/__init__.py +++ b/ATRI/plugins/status/__init__.py @@ -22,7 +22,7 @@ async def _status(): info_msg = "アトリは高性能ですから！" -@scheduler.scheduled_job("interval", name="状态检查", minutes=10, misfire_grace_time=15) +@scheduler.scheduled_job("interval", name="状态检查", minutes=10, misfire_grace_time=15) # type: ignore async def _status_checking(): msg, stat = IsSurvive().get_status() if not stat: diff --git a/ATRI/plugins/status/data_source.py b/ATRI/plugins/status/data_source.py index 74882de..68ad216 100644 --- a/ATRI/plugins/status/data_source.py +++ b/ATRI/plugins/status/data_source.py @@ -8,12 +8,9 @@ from ATRI.rule import is_in_service from ATRI.exceptions import GetStatusError -__doc__ = "检查咱自身状态" - - 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: -- cgit v1.2.3 From 1caf5ae8bb3e0560451f967f276ff1291a80d1dd Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Mon, 4 Apr 2022 17:06:09 +0800 Subject: =?UTF-8?q?=F0=9F=A7=B1=20=E9=92=88=E5=AF=B9=20=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/status/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ATRI/plugins/status') diff --git a/ATRI/plugins/status/__init__.py b/ATRI/plugins/status/__init__.py index f62c86a..05ece79 100644 --- a/ATRI/plugins/status/__init__.py +++ b/ATRI/plugins/status/__init__.py @@ -23,7 +23,7 @@ info_msg = "アトリは高性能ですから！" @scheduler.scheduled_job("interval", name="状态检查", minutes=10, misfire_grace_time=15) # type: ignore -async def _status_checking(): +async def _check_runtime(): msg, stat = IsSurvive().get_status() if not stat: await status.finish(msg) -- cgit v1.2.3 From 76cfd49f4129702ac9694077adb7529e390a2957 Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Tue, 5 Apr 2022 15:19:45 +0800 Subject: =?UTF-8?q?=F0=9F=9A=B8=20=E6=8F=90=E9=AB=98=E8=87=AA=E8=BA=AB?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=AF=E8=A7=82=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/status/data_source.py | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'ATRI/plugins/status') diff --git a/ATRI/plugins/status/data_source.py b/ATRI/plugins/status/data_source.py index 68ad216..3595c0c 100644 --- a/ATRI/plugins/status/data_source.py +++ b/ATRI/plugins/status/data_source.py @@ -8,6 +8,21 @@ from ATRI.rule import is_in_service from ATRI.exceptions import GetStatusError +_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, "状态", "检查自身状态", rule=is_in_service("状态")) @@ -52,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 -- cgit v1.2.3