mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-05 03:39:59 +08:00
性能优化 (#2126)
* 性能优化 * 代码改进 * 优化浏览器代际切换逻辑 * 统一缓存与生命周期 * 添加aiomysql依赖 * 优化插件路径处理逻辑,简化条件判断;在虚拟环境包管理器中添加编码和错误处理参数以增强稳定性 * 🚨 auto fix by pre-commit hooks * 优化Windows下的关闭逻辑 * 代码优化 * bugfix:修复配置重载问题 * bugfix:修复插件加载启动竞态问题 * 收敛事件入口和权限上下文 * 优化 Windows launcher 关闭重启兜底 --------- Co-authored-by: HibiKier <775757368@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
HibiKier
pre-commit-ci[bot]
parent
24c316cd2c
commit
5d92ccd3b0
@@ -2,10 +2,17 @@ import asyncio
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
import contextlib
|
||||
import os
|
||||
import signal
|
||||
|
||||
import anyio.to_thread
|
||||
from nonebot.drivers import Driver
|
||||
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.memory_governor import (
|
||||
start_memory_governor,
|
||||
stop_memory_governor,
|
||||
)
|
||||
from zhenxun.services.send_queue import start_send_queue, stop_send_queue
|
||||
from zhenxun.services.uninfo_patch import apply_uninfo_onebot11_patch
|
||||
from zhenxun.utils.manager.priority_manager import PriorityLifecycle
|
||||
|
||||
DEFAULT_EXECUTOR_MIN_WORKERS = 16
|
||||
@@ -14,6 +21,7 @@ DEFAULT_ANYIO_MIN_TOKENS = 32
|
||||
DEFAULT_ANYIO_MAX_TOKENS = 128
|
||||
|
||||
_thread_executor: ThreadPoolExecutor | None = None
|
||||
_launcher_watchdog_task: asyncio.Task[None] | None = None
|
||||
_runtime_hooks_registered = False
|
||||
_alconna_patch_applied = False
|
||||
|
||||
@@ -57,14 +65,60 @@ def _apply_alconna_conflict_patch() -> None:
|
||||
_alconna_patch_applied = True
|
||||
|
||||
|
||||
def register_runtime_bootstrap(driver: Driver) -> None:
|
||||
async def _launcher_watchdog_loop(launcher_pid: int) -> None:
|
||||
try:
|
||||
import psutil
|
||||
except Exception:
|
||||
return
|
||||
current_pid = os.getpid()
|
||||
while True:
|
||||
await asyncio.sleep(2)
|
||||
if psutil.pid_exists(launcher_pid):
|
||||
continue
|
||||
logger.warning(
|
||||
f"检测到 launcher 进程 {launcher_pid} 已退出,worker 将主动结束...",
|
||||
"RuntimeBootstrap",
|
||||
)
|
||||
with contextlib.suppress(Exception):
|
||||
os.kill(current_pid, signal.SIGTERM)
|
||||
return
|
||||
|
||||
|
||||
def _start_launcher_watchdog() -> None:
|
||||
global _launcher_watchdog_task
|
||||
if _launcher_watchdog_task is not None and not _launcher_watchdog_task.done():
|
||||
return
|
||||
launcher_pid_text = os.getenv("ZHENXUN_LAUNCHER_PID", "").strip()
|
||||
if not launcher_pid_text:
|
||||
return
|
||||
with contextlib.suppress(ValueError):
|
||||
launcher_pid = int(launcher_pid_text)
|
||||
if launcher_pid > 0:
|
||||
_launcher_watchdog_task = asyncio.create_task(
|
||||
_launcher_watchdog_loop(launcher_pid)
|
||||
)
|
||||
|
||||
|
||||
async def _stop_launcher_watchdog() -> None:
|
||||
global _launcher_watchdog_task
|
||||
task = _launcher_watchdog_task
|
||||
_launcher_watchdog_task = None
|
||||
if task is None or task.done():
|
||||
return
|
||||
task.cancel()
|
||||
with contextlib.suppress(asyncio.CancelledError):
|
||||
await task
|
||||
|
||||
|
||||
def register_runtime_bootstrap(_driver) -> None:
|
||||
_apply_alconna_conflict_patch()
|
||||
apply_uninfo_onebot11_patch()
|
||||
global _runtime_hooks_registered
|
||||
if _runtime_hooks_registered:
|
||||
return
|
||||
_runtime_hooks_registered = True
|
||||
|
||||
@driver.on_startup
|
||||
@PriorityLifecycle.on_startup(priority=-100)
|
||||
async def _setup_runtime_concurrency() -> None:
|
||||
global _thread_executor
|
||||
workers = _get_executor_workers()
|
||||
@@ -77,10 +131,16 @@ def register_runtime_bootstrap(driver: Driver) -> None:
|
||||
with contextlib.suppress(Exception):
|
||||
limiter = anyio.to_thread.current_default_thread_limiter()
|
||||
limiter.total_tokens = _get_anyio_tokens(workers)
|
||||
_start_launcher_watchdog()
|
||||
await start_send_queue()
|
||||
await start_memory_governor()
|
||||
|
||||
@PriorityLifecycle.on_shutdown(priority=50)
|
||||
async def _shutdown_runtime_concurrency() -> None:
|
||||
global _thread_executor
|
||||
await _stop_launcher_watchdog()
|
||||
await stop_send_queue()
|
||||
await stop_memory_governor()
|
||||
executor = _thread_executor
|
||||
_thread_executor = None
|
||||
if executor is not None:
|
||||
|
||||
Reference in New Issue
Block a user