feat: 优化事件管理,添加事件处理超时和并发限制功能
This commit is contained in:
@@ -101,7 +101,9 @@ class BaseEvent:
|
||||
def __name__(self):
|
||||
return self.name
|
||||
|
||||
async def activate(self, params: dict) -> HandlerResultsCollection:
|
||||
async def activate(
|
||||
self, params: dict, handler_timeout: float | None = None, max_concurrency: int | None = None
|
||||
) -> HandlerResultsCollection:
|
||||
"""激活事件,执行所有订阅的处理器
|
||||
|
||||
Args:
|
||||
@@ -115,40 +117,71 @@ class BaseEvent:
|
||||
|
||||
# 使用锁确保同一个事件不能同时激活多次
|
||||
async with self.event_handle_lock:
|
||||
# 按权重从高到低排序订阅者
|
||||
# 使用直接属性访问,-1代表自动权重
|
||||
sorted_subscribers = sorted(
|
||||
self.subscribers, key=lambda h: h.weight if hasattr(h, "weight") and h.weight != -1 else 0, reverse=True
|
||||
)
|
||||
|
||||
# 并行执行所有订阅者
|
||||
tasks = []
|
||||
for subscriber in sorted_subscribers:
|
||||
# 为每个订阅者创建执行任务
|
||||
task = self._execute_subscriber(subscriber, params)
|
||||
tasks.append(task)
|
||||
if not sorted_subscribers:
|
||||
return HandlerResultsCollection([])
|
||||
|
||||
# 等待所有任务完成
|
||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||
concurrency_limit = None
|
||||
if max_concurrency is not None:
|
||||
concurrency_limit = max_concurrency if max_concurrency > 0 else None
|
||||
if concurrency_limit:
|
||||
concurrency_limit = min(concurrency_limit, len(sorted_subscribers))
|
||||
|
||||
# 处理执行结果
|
||||
processed_results = []
|
||||
for i, result in enumerate(results):
|
||||
subscriber = sorted_subscribers[i]
|
||||
semaphore = (
|
||||
asyncio.Semaphore(concurrency_limit)
|
||||
if concurrency_limit and concurrency_limit < len(sorted_subscribers)
|
||||
else None
|
||||
)
|
||||
|
||||
async def _run_handler(subscriber):
|
||||
handler_name = (
|
||||
subscriber.handler_name if hasattr(subscriber, "handler_name") else subscriber.__class__.__name__
|
||||
)
|
||||
if result:
|
||||
if isinstance(result, Exception):
|
||||
# 处理执行异常
|
||||
logger.error(f"事件处理器 {handler_name} 执行失败: {result}")
|
||||
processed_results.append(HandlerResult(False, True, str(result), handler_name))
|
||||
|
||||
async def _invoke():
|
||||
return await self._execute_subscriber(subscriber, params)
|
||||
|
||||
try:
|
||||
if handler_timeout and handler_timeout > 0:
|
||||
result = await asyncio.wait_for(_invoke(), timeout=handler_timeout)
|
||||
else:
|
||||
# 正常执行结果
|
||||
if not result.handler_name:
|
||||
# 补充handler_name
|
||||
result.handler_name = handler_name
|
||||
processed_results.append(result)
|
||||
result = await _invoke()
|
||||
except asyncio.TimeoutError:
|
||||
logger.warning(f"事件处理器 {handler_name} 执行超时 ({handler_timeout}s)")
|
||||
return HandlerResult(False, True, f"timeout after {handler_timeout}s", handler_name)
|
||||
except Exception as exc:
|
||||
logger.error(f"事件处理器 {handler_name} 执行失败: {exc}")
|
||||
return HandlerResult(False, True, str(exc), handler_name)
|
||||
|
||||
if not isinstance(result, HandlerResult):
|
||||
return HandlerResult(True, True, result, handler_name)
|
||||
|
||||
if not result.handler_name:
|
||||
result.handler_name = handler_name
|
||||
return result
|
||||
|
||||
async def _guarded_run(subscriber):
|
||||
if semaphore:
|
||||
async with semaphore:
|
||||
return await _run_handler(subscriber)
|
||||
return await _run_handler(subscriber)
|
||||
|
||||
tasks = [asyncio.create_task(_guarded_run(subscriber)) for subscriber in sorted_subscribers]
|
||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||
|
||||
processed_results: list[HandlerResult] = []
|
||||
for subscriber, result in zip(sorted_subscribers, results):
|
||||
handler_name = (
|
||||
subscriber.handler_name if hasattr(subscriber, "handler_name") else subscriber.__class__.__name__
|
||||
)
|
||||
if isinstance(result, Exception):
|
||||
logger.error(f"事件处理器 {handler_name} 执行失败: {result}")
|
||||
processed_results.append(HandlerResult(False, True, str(result), handler_name))
|
||||
else:
|
||||
processed_results.append(result)
|
||||
|
||||
return HandlerResultsCollection(processed_results)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user