From 1dd9228d018342c608219b876da592fe496e6eb7 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 25 Feb 2024 09:03:43 +0800
Subject: [PATCH] fix warning

---
 app/scheduler.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/scheduler.py b/app/scheduler.py
index 2e27d0fc..7d75d6d9 100644
--- a/app/scheduler.py
+++ b/app/scheduler.py
@@ -1,10 +1,12 @@
 import logging
 import threading
+import traceback
 from datetime import datetime, timedelta
 from typing import List
 
 import pytz
 from apscheduler.executors.pool import ThreadPoolExecutor
+from apscheduler.jobstores.base import JobLookupError
 from apscheduler.schedulers.background import BackgroundScheduler
 
 from app import schemas
@@ -266,7 +268,7 @@ class Scheduler(metaclass=Singleton):
         with self._lock:
             try:
                 self._jobs[job_id]["running"] = False
-            except:
+            except KeyError:
                 pass
             # 如果是单次任务, 应立即移除缓存
             if not self._scheduler.get_job(job_id):
@@ -282,7 +284,8 @@ class Scheduler(metaclass=Singleton):
         with self._lock:
             try:
                 plugin_services = PluginManager().run_plugin_method(pid, "get_service") or []
-            except:
+            except Exception as e:
+                logger.error(f"运行插件 {pid} 服务失败：{str(e)} - {traceback.format_exc()}")
                 return
             # 获取插件名称
             plugin_name = PluginManager().get_plugin_attr(pid, "plugin_name")
@@ -324,7 +327,7 @@ class Scheduler(metaclass=Singleton):
                         self._jobs.pop(job_id, None)
                         try:
                             self._scheduler.remove_job(job_id)
-                        except:
+                        except JobLookupError:
                             pass
                         logger.info(f"移除插件服务({plugin_name})：{service.get('name')}")
                 except Exception as e: