Round 3 fixes: cancelled polling, aggregator invalid_count, filter state, scheduler atomicity, HTTP exception handler, tests
This commit is contained in:
@@ -1,28 +1,33 @@
|
||||
"""设置相关路由"""
|
||||
from fastapi import APIRouter, Request
|
||||
from fastapi import APIRouter, Request, Depends
|
||||
from app.core.db import get_db
|
||||
from app.repositories.settings_repo import SettingsRepository
|
||||
from app.models.schemas import SettingsSchema
|
||||
from app.api.common import success_response
|
||||
from app.api.deps import get_settings_repo
|
||||
from app.core.exceptions import ProxyPoolException
|
||||
from app.core.log import logger
|
||||
|
||||
router = APIRouter(prefix="/api/settings", tags=["settings"])
|
||||
settings_repo = SettingsRepository()
|
||||
|
||||
|
||||
@router.get("")
|
||||
async def get_settings():
|
||||
async def get_settings(settings_repo: SettingsRepository = Depends(get_settings_repo)):
|
||||
async with get_db() as db:
|
||||
settings = await settings_repo.get_all(db)
|
||||
return success_response("获取设置成功", settings)
|
||||
|
||||
|
||||
@router.post("")
|
||||
async def save_settings(request: SettingsSchema, http_request: Request):
|
||||
async def save_settings(
|
||||
request: SettingsSchema,
|
||||
http_request: Request,
|
||||
settings_repo: SettingsRepository = Depends(get_settings_repo),
|
||||
):
|
||||
async with get_db() as db:
|
||||
success = await settings_repo.save(db, request.model_dump())
|
||||
if not success:
|
||||
raise RuntimeError("保存设置失败")
|
||||
raise ProxyPoolException("保存设置失败", 500)
|
||||
|
||||
# 热更新运行中调度器的间隔时间
|
||||
scheduler = getattr(http_request.app.state, "scheduler", None)
|
||||
@@ -47,9 +52,9 @@ async def save_settings(request: SettingsSchema, http_request: Request):
|
||||
validator._init_max_concurrency = request.default_concurrency
|
||||
if request.validation_targets:
|
||||
validator.update_test_urls(request.validation_targets)
|
||||
# 重新创建 semaphore 和 session
|
||||
validator._semaphore = None
|
||||
# 先关闭现有 session,再重置 semaphore,避免竞态窗口
|
||||
await validator.close()
|
||||
validator._semaphore = None
|
||||
logger.info(f"Validator config updated: timeout={request.validation_timeout}, concurrency={request.default_concurrency}, targets={request.validation_targets}")
|
||||
|
||||
return success_response("保存设置成功", request.model_dump())
|
||||
|
||||
Reference in New Issue
Block a user