whatevertogo
3fd6c4c8a6
* fix: 修复 asyncio 事件循环相关的问题 1. components.py: 修复异常处理结构错误 - 将 except Exception 移到正确的内部 try 块 - 确保 _download_file() 异常能被正确捕获和记录 2. session_lock.py: 修复跨事件循环 Lock 绑定问题 - 添加 _access_lock_loop_id 追踪事件循环 - 当事件循环变化时重新创建 Lock Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 根据代码审查反馈修复问题 1. components.py: 移除 asyncio.set_event_loop() 调用 - 创建临时 event loop 时不再设置为全局 - 避免干扰其他 asyncio 使用 2. session_lock.py: 简化延迟初始化逻辑 - 移除 loop-ID 追踪和 _get_lock 方法 - 使用 setdefault 简化 session lock 创建 - 保留延迟初始化行为 3. wecomai_queue_mgr.py: 使用 time.monotonic() 替代 loop.time() - 同步方法不再依赖活动的 event loop - 避免在非异步上下文中抛出 RuntimeError Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 优化 asyncio 事件循环管理，使用安全的方式创建和关闭事件循环 * fix: 根据代码审查反馈改进异常处理和事件循环使用 - main.py: 显式处理 check_dashboard_files() 返回 None 的情况 - components.py: 使用 logger.exception 保留异常堆栈信息 - star_manager.py: 添加 Future 异常回调处理 __del__ 执行异常 - bay_manager.py: 缓存事件循环引用避免重复调用 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 简化 SessionLockManager 使用 defaultdict 和 setdefault - 使用 defaultdict(asyncio.Lock) 简化锁的懒创建 - 使用 setdefault 简化 _get_loop_state 逻辑 - 减少 get + if 分支，提升可读性 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 降低 webui_dir 检查失败时的日志级别为 warning 改为警告而非退出，允许程序在无 WebUI 的情况下继续运行 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 重构事件循环锁管理，简化锁状态管理逻辑 * 新增对 SessionLockManager 的多事件循环隔离测试 * fix: 修复测试中的变量声明和断言，确保事件循环管理器的正确性 * fix: 修复插件删除时异常处理逻辑，确保正确记录错误信息 * fix: 新增针对多个事件循环的 OneBot 实例的测试，确保锁对象在不同事件循环间不共享 --------- Co-authored-by: whatevertogo <whatevertogo@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
56 lines
1.8 KiB
Python
56 lines
1.8 KiB
Python
import asyncio
|
|
import threading
|
|
import weakref
|
|
from collections import defaultdict
|
|
from contextlib import asynccontextmanager
|
|
|
|
|
|
class _PerLoopSessionLockManager:
|
|
"""Per-event-loop session lock manager; keeps original simple semantics."""
|
|
|
|
def __init__(self) -> None:
|
|
self._locks: dict[str, asyncio.Lock] = defaultdict(asyncio.Lock)
|
|
self._lock_count: dict[str, int] = defaultdict(int)
|
|
self._access_lock = asyncio.Lock()
|
|
|
|
@asynccontextmanager
|
|
async def acquire_lock(self, session_id: str):
|
|
async with self._access_lock:
|
|
lock = self._locks[session_id]
|
|
self._lock_count[session_id] += 1
|
|
|
|
try:
|
|
async with lock:
|
|
yield
|
|
finally:
|
|
async with self._access_lock:
|
|
self._lock_count[session_id] -= 1
|
|
if self._lock_count[session_id] == 0:
|
|
self._locks.pop(session_id, None)
|
|
self._lock_count.pop(session_id, None)
|
|
|
|
|
|
class SessionLockManager:
|
|
"""Thread-safe session lock manager with per-event-loop isolation."""
|
|
|
|
def __init__(self) -> None:
|
|
self._state_guard = threading.Lock()
|
|
self._loop_managers: weakref.WeakKeyDictionary[
|
|
asyncio.AbstractEventLoop, _PerLoopSessionLockManager
|
|
] = weakref.WeakKeyDictionary()
|
|
|
|
def _get_loop_manager(self) -> _PerLoopSessionLockManager:
|
|
"""Get the lock manager for the current event loop."""
|
|
loop = asyncio.get_running_loop()
|
|
with self._state_guard:
|
|
return self._loop_managers.setdefault(loop, _PerLoopSessionLockManager())
|
|
|
|
@asynccontextmanager
|
|
async def acquire_lock(self, session_id: str):
|
|
manager = self._get_loop_manager()
|
|
async with manager.acquire_lock(session_id):
|
|
yield
|
|
|
|
|
|
session_lock_manager = SessionLockManager()
|