From 1caf5ae8bb3e0560451f967f276ff1291a80d1dd Mon Sep 17 00:00:00 2001
From: Kyomotoi <kyomotoiowo@gmail.com>
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/essential.py       |  4 ++++
 ATRI/plugins/status/__init__.py |  2 +-
 ATRI/utils/apscheduler.py       | 23 +----------------------
 3 files changed, 6 insertions(+), 23 deletions(-)

(limited to 'ATRI')

diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py
index 242e267..37c18a4 100644
--- a/ATRI/plugins/essential.py
+++ b/ATRI/plugins/essential.py
@@ -66,6 +66,10 @@ async def startup():
     except Exception:
         log.error("检查 更新/最新推送 失败...")
 
+    if not scheduler.running:
+        scheduler.start()
+        log.info("Scheduler Started.")
+
     log.info("アトリは、高性能ですから！")
 
 
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)
diff --git a/ATRI/utils/apscheduler.py b/ATRI/utils/apscheduler.py
index 186ff8e..e1959c1 100644
--- a/ATRI/utils/apscheduler.py
+++ b/ATRI/utils/apscheduler.py
@@ -1,34 +1,13 @@
-"""
-Fork from: https://github.com/nonebot/plugin-apscheduler
-"""
 import logging
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
-from nonebot import get_driver
-from nonebot.log import logger, LoguruHandler
+from nonebot.log import LoguruHandler
 
 
-apscheduler_autostart: bool = True
-# apscheduler_config: dict = {"apscheduler.timezone": "Asia/Shanghai"}
-
-
-driver = get_driver()
 scheduler = AsyncIOScheduler(timezone="Asia/Shanghai")
 
 
-async def _start_scheduler():
-    if not scheduler.running:
-        # scheduler.configure(apscheduler_config)
-        scheduler.start()
-        logger.info("Scheduler Started.")
-
-
-if apscheduler_autostart:
-    driver.on_startup(_start_scheduler)
-
 aps_logger = logging.getLogger("apscheduler")
 aps_logger.setLevel(logging.DEBUG)
 aps_logger.handlers.clear()
 aps_logger.addHandler(LoguruHandler())
-
-from apscheduler.triggers.date import DateTrigger
-- 
cgit v1.2.3