BruceSun
/
MaiBot
mirror of https://github.com/Mai-with-u/MaiBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: resolve dismatch between inserted keys and deleted keys

pull/1518/head
KeepingRunning 2026-02-20 00:23:05 +08:00
parent b63b7a7fb9
commit 583e086561
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugin_system/core/events_manager.py
View File

@ -325,9 +325,10 @@ class EventsManager:
task_name = f"{handler.plugin_name}-{handler.handler_name}" task_name = f"{handler.plugin_name}-{handler.handler_name}"
task.set_name(task_name) task.set_name(task_name)
task.add_done_callback(lambda t: self._task_done_callback(t, event_type)) handler_name = handler.handler_name
task.add_done_callback(lambda t: self._task_done_callback(t, event_type, handler_name))
self._handler_tasks.setdefault(handler.handler_name, []).append(task) self._handler_tasks.setdefault(handler_name, []).append(task)
except Exception as e: except Exception as e:
logger.error(f"创建事件处理器任务 {handler.handler_name} 时发生异常: {e}", exc_info=True) logger.error(f"创建事件处理器任务 {handler.handler_name} 时发生异常: {e}", exc_info=True)
@ -382,6 +383,7 @@ class EventsManager:
self, self,
task: asyncio.Task[Tuple[bool, bool, str | None, CustomEventHandlerResult | None, MaiMessages | None]], task: asyncio.Task[Tuple[bool, bool, str | None, CustomEventHandlerResult | None, MaiMessages | None]],
event_type: EventType | str, event_type: EventType | str,
handler_name: str,
): ):
"""任务完成回调""" """任务完成回调"""
task_name = task.get_name() or "Unknown Task" task_name = task.get_name() or "Unknown Task"
@ -406,7 +408,10 @@ class EventsManager:
logger.error(f"事件处理任务 {task_name} 发生异常: {e}") logger.error(f"事件处理任务 {task_name} 发生异常: {e}")
finally: finally:
with contextlib.suppress(ValueError, KeyError): with contextlib.suppress(ValueError, KeyError):
self._handler_tasks[task_name].remove(task) tasks = self._handler_tasks[handler_name]
tasks.remove(task)
if not tasks:
del self._handler_tasks[handler_name]
events_manager = EventsManager() events_manager = EventsManager()