perf(douyu): 拆分任务槽并改造绑定扫码调度
This commit is contained in:
@@ -2,14 +2,14 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
from concurrent.futures import as_completed
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy.orm import joinedload
|
||||
|
||||
from core.huya.cookie_utils import normalize_huya_cookie
|
||||
|
||||
from ..database import SessionLocal
|
||||
from ..database import WorkerSessionLocal
|
||||
from ..models import HuyaAccount, HuyaTask
|
||||
from .huya_runner_bind import BindMixin
|
||||
from .huya_runner_core import ( # noqa: F401 (huya_batch_registry 供 routers 重导出)
|
||||
@@ -20,6 +20,7 @@ from .huya_runner_elite import EliteMixin
|
||||
from .huya_runner_goods import GoodsMixin
|
||||
from .huya_runner_recharge import RechargeMixin
|
||||
from .huya_service import HUYA_CONFIG_FIELDS, ensure_huya_config, huya_config_value
|
||||
from .task_runtime import TaskLane, submit
|
||||
|
||||
|
||||
class HuyaBatchRunner(
|
||||
@@ -34,7 +35,7 @@ class HuyaBatchRunner(
|
||||
def _execute_one(
|
||||
self, task_id: int, account_info: dict, config_info: dict, total: int
|
||||
):
|
||||
worker_db = SessionLocal()
|
||||
worker_db = WorkerSessionLocal()
|
||||
try:
|
||||
task = worker_db.query(HuyaTask).filter(HuyaTask.id == task_id).first()
|
||||
account = (
|
||||
@@ -193,27 +194,29 @@ class HuyaBatchRunner(
|
||||
self._push_log("result", "")
|
||||
return
|
||||
|
||||
with ThreadPoolExecutor(max_workers=self.concurrency) as executor:
|
||||
futures = []
|
||||
for item in task_infos:
|
||||
if self._stop.is_set():
|
||||
self._push_log("warning", "任务已停止,跳过剩余账号")
|
||||
break
|
||||
futures.append(
|
||||
executor.submit(
|
||||
self._execute_one,
|
||||
item["task_id"],
|
||||
item["account_info"],
|
||||
config_info,
|
||||
total,
|
||||
)
|
||||
)
|
||||
futures = []
|
||||
for item in task_infos:
|
||||
if self._stop.is_set():
|
||||
self._push_log("warning", "任务已停止,跳过剩余账号")
|
||||
break
|
||||
future = submit(
|
||||
TaskLane.HUYA_BATCH,
|
||||
self._execute_one,
|
||||
item["task_id"],
|
||||
item["account_info"],
|
||||
config_info,
|
||||
total,
|
||||
stopped=self._stop.is_set,
|
||||
)
|
||||
if future is None:
|
||||
break
|
||||
futures.append(future)
|
||||
|
||||
for future in as_completed(futures):
|
||||
try:
|
||||
future.result()
|
||||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||||
self._push_log("error", f"虎牙 Worker 异常: {exc}")
|
||||
for future in as_completed(futures):
|
||||
try:
|
||||
future.result()
|
||||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||||
self._push_log("error", f"虎牙 Worker 异常: {exc}")
|
||||
|
||||
self._push_log("info", f"虎牙批次 {self.batch_id} 完成")
|
||||
self._push_log("result", "")
|
||||
|
||||
Reference in New Issue
Block a user