feat(automation): 让在线熔断阈值作用于自动重登

This commit is contained in:
yml
2026-11-21 22:03:45 +08:00
parent 7172ed2f94
commit e75be0aa63
3 changed files with 51 additions and 5 deletions
@@ -21,7 +21,7 @@ from sqlalchemy import func, or_
from sqlalchemy.orm import Session
from ....database import WorkerSessionLocal
from ....models import Account, AutomationJob, LoginTask, User
from ....models import Account, AutomationJob, LoginQuotaSetting, LoginTask, User
from ....models import ProxyConfig as ProxyConfigModel
from ...account_events_service import EVENT_RELOGIN_FAILED, emit
from ...account_lifecycle import (
@@ -252,9 +252,28 @@ def evaluate_failure_circuit(
return scanned >= minimum and ratio > threshold, hard_failures, ratio
def resolve_failure_circuit_config(
db: Session,
config: dict[str, Any] | None,
) -> dict[str, Any]:
"""合并作业配置和在线登录预算里的失败暂停阈值。"""
resolved = dict(config or {})
if "failure_pause_ratio" not in resolved:
setting = (
db.query(LoginQuotaSetting)
.filter(LoginQuotaSetting.id == 1)
.first()
)
if setting is not None:
resolved["failure_pause_ratio"] = int(
setting.failure_pause_ratio
)
return resolved
def run_ck_relogin(db: Session, job: AutomationJob) -> dict[str, Any]:
now = datetime.now(UTC)
config = job.config or {}
config = resolve_failure_circuit_config(db, job.config)
max_attempts = int(config.get("max_attempts_per_day", 2) or 2)
system_user_id = _system_user_id(db)