fix: 修复 scheduler remove 同一个 Job 的问题

Author: tianxiu2b2t

assets/js/index.js

@@ -1 +0,0 @@
-console.log(module)

core/__init__.py

@@ -15,7 +15,6 @@
 async def main():
     start = time.monotonic_ns()
     await scheduler.init()
-    await database.init()
     await web.init()
     await dashboard.init()
     await cluster.init()
@@ -29,7 +28,6 @@ async def main():
     finally:
         await cluster.unload()
         await web.unload()
-        await database.unload()
         await scheduler.unload()
 
 def init():

core/database/__init__.py

@@ -88,6 +88,10 @@ def cancel(task_id: Optional[int] = None):
     if task_id is None:
         return
     if task_id in tasks:
-        tasks.pop(task_id).remove()
+        try:
+            tasks.pop(task_id).remove()
+        except:
+            logger.debug(f'Task {task_id} was cancelled')
+            return
         logger.debug(f'Task {task_id} canceled')
 

core/scheduler.py

@@ -30,6 +30,6 @@
     "cluster.debug.socketio.connected": "SocketIO 已连接",
     "cluster.success.cluster.disable": "节点 [${cluster}] 已正常下线",
     "cluster.info.want_enable": "节点 [${cluster}] 正在启用中……",
-    "cluster.info.cluster.retry_enable": "节点 [${cluster}] 将在 [${delay}] 后重新启用",
-    "cluster.success.cluster.enable": "节点 [${cluster}] 已正常上线"
+    "cluster.info.cluster.retry_enable": "节点 [${id}] 将在 [${delay}] 后重新启用",
+    "cluster.success.enabled": "节点 [${cluster}] 已正常上线"
 }