875e61f17e
- 统一设置系统：create_scheduler_service 读取 DB 设置覆盖默认值 - 修复 ProxyRepository.update_score 误删所有无效代理的 SQL - ValidationQueue：修复 Worker 计数漂移与启动恢复任务饿死 - SchedulerService：移除 drain() 阻塞，主循环可正常响应 stop - TaskService：在调度器周期内自动清理过期任务，防止内存泄漏 - lifespan/conftest：规范关闭顺序，消除 Event loop closed 警告 - Repository：异常日志增加 exc_info，今日新增按 created_at 统计 - ValidatorService：防止 HTTP session 重复关闭，移除 SOCKS 多余 close - 前端：补全 pluginsStore.isEmpty，ProxyList 最低分数上限改为 100 - 删除 config.py 中冗余的 cors_origins_list property
109 lines
4.1 KiB
Python
109 lines
4.1 KiB
Python
"""调度器服务 - 定时验证存量代理"""
|
|
import asyncio
|
|
from datetime import datetime
|
|
from app.core.db import get_db
|
|
from app.repositories.proxy_repo import ProxyRepository
|
|
from app.repositories.task_repo import ValidationTaskRepository
|
|
from app.core.tasks.queue import ValidationQueue
|
|
from app.core.config import settings as app_settings
|
|
from app.core.log import logger
|
|
from app.models.domain import ProxyRaw
|
|
|
|
|
|
class SchedulerService:
|
|
"""代理验证调度器"""
|
|
|
|
def __init__(
|
|
self,
|
|
validation_queue: ValidationQueue,
|
|
proxy_repo: ProxyRepository = ProxyRepository(),
|
|
):
|
|
self.validation_queue = validation_queue
|
|
self.proxy_repo = proxy_repo
|
|
self.interval_minutes = 30
|
|
self.running = False
|
|
self._stop_event = asyncio.Event()
|
|
self._task: asyncio.Task | None = None
|
|
self._validate_task: asyncio.Task | None = None
|
|
|
|
async def start(self):
|
|
if self.running:
|
|
logger.warning("Scheduler already running")
|
|
return
|
|
self._stop_event.clear()
|
|
self.running = True
|
|
await self.validation_queue.start()
|
|
self._task = asyncio.create_task(self._run_loop())
|
|
logger.info("Scheduler started")
|
|
|
|
async def stop(self):
|
|
self.running = False
|
|
self._stop_event.set()
|
|
if self._task:
|
|
self._task.cancel()
|
|
try:
|
|
await self._task
|
|
except asyncio.CancelledError:
|
|
pass
|
|
self._task = None
|
|
await self.validation_queue.stop()
|
|
logger.info("Scheduler stopped")
|
|
|
|
def cancel_validate_task(self):
|
|
"""取消正在执行的全量验证后台任务"""
|
|
if self._validate_task and not self._validate_task.done():
|
|
self._validate_task.cancel()
|
|
|
|
async def validate_all_now(self):
|
|
"""立即执行一次全量验证（后台运行，不阻塞）"""
|
|
if self._validate_task and not self._validate_task.done():
|
|
return
|
|
self._validate_task = asyncio.create_task(self._do_validate_all())
|
|
|
|
async def _run_loop(self):
|
|
"""定时循环"""
|
|
while self.running:
|
|
try:
|
|
# 清理过期任务，防止内存无限增长
|
|
from app.services.task_service import task_service
|
|
task_service.cleanup_old_tasks()
|
|
await self._do_validate_all()
|
|
except Exception as e:
|
|
logger.error(f"Scheduler loop error: {e}", exc_info=True)
|
|
# 等待下一次
|
|
try:
|
|
await asyncio.wait_for(self._stop_event.wait(), timeout=self.interval_minutes * 60)
|
|
except asyncio.TimeoutError:
|
|
pass
|
|
|
|
async def _do_validate_all(self):
|
|
"""验证数据库中所有存量代理"""
|
|
try:
|
|
logger.info("Starting scheduled validation for all proxies")
|
|
async with get_db() as db:
|
|
# 清理 7 天前的验证任务记录，防止表无限增长
|
|
cleaned = await ValidationTaskRepository.cleanup_old(db, days=7)
|
|
if cleaned:
|
|
logger.info(f"Cleaned up {cleaned} old validation tasks")
|
|
proxies = await self.proxy_repo.list_all(db)
|
|
if not proxies:
|
|
logger.info("No proxies to validate")
|
|
return
|
|
|
|
logger.info(f"Validating {len(proxies)} proxies from database")
|
|
# 批量提交到验证队列，不再阻塞等待 drain
|
|
batch_size = 100
|
|
total_batches = (len(proxies) - 1) // batch_size + 1
|
|
for i in range(0, len(proxies), batch_size):
|
|
if not self.running:
|
|
break
|
|
batch = proxies[i : i + batch_size]
|
|
await self.validation_queue.submit([
|
|
ProxyRaw(p.ip, p.port, p.protocol) for p in batch
|
|
])
|
|
logger.info(f"Submitted batch {i // batch_size + 1}/{total_batches}")
|
|
|
|
logger.info("Scheduled validation batches submitted")
|
|
except Exception as e:
|
|
logger.error(f"Scheduled validation error: {e}", exc_info=True)
|