mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-08 17:08:35 +08:00
fix: keep subscription execution dependency boundary
This commit is contained in:
@@ -11,7 +11,6 @@ from app.application.subscription.sitebudget import (
|
|||||||
SubscriptionSearchDeferred,
|
SubscriptionSearchDeferred,
|
||||||
SubscriptionSiteBudgetDeferral,
|
SubscriptionSiteBudgetDeferral,
|
||||||
)
|
)
|
||||||
from app.runtime.log import logger
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
@dataclass(frozen=True, slots=True)
|
||||||
@@ -123,7 +122,6 @@ def handle_subscription_search_deferred(
|
|||||||
queue: SubscriptionSearchRepository,
|
queue: SubscriptionSearchRepository,
|
||||||
task_id: str,
|
task_id: str,
|
||||||
lease_token: str,
|
lease_token: str,
|
||||||
subscribe_name: str,
|
|
||||||
deferred: SubscriptionSearchDeferred,
|
deferred: SubscriptionSearchDeferred,
|
||||||
record: Callable[[str, Optional[str]], None],
|
record: Callable[[str, Optional[str]], None],
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -134,13 +132,7 @@ def handle_subscription_search_deferred(
|
|||||||
available_at=deferred.retry_at,
|
available_at=deferred.retry_at,
|
||||||
)
|
)
|
||||||
if requeued:
|
if requeued:
|
||||||
logger.debug(
|
|
||||||
f"订阅 {subscribe_name} 站点预算冲突,已排队至 {deferred.retry_at} 后重试,"
|
|
||||||
f"sites={','.join(str(site_id) for site_id in deferred.site_ids)}"
|
|
||||||
)
|
|
||||||
record("requeued", "site_budget_deferred")
|
record("requeued", "site_budget_deferred")
|
||||||
else:
|
|
||||||
logger.debug(f"订阅搜索任务 {task_id} 租约已变化,跳过重复站点预算重排队")
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
@dataclass(frozen=True, slots=True)
|
||||||
|
|||||||
@@ -622,7 +622,7 @@ class _SubscribeSearchQueueOwner(_SubscribeSearchQueueCoordinator):
|
|||||||
)
|
)
|
||||||
except SubscriptionSearchDeferred as deferred:
|
except SubscriptionSearchDeferred as deferred:
|
||||||
handle_subscription_search_deferred(
|
handle_subscription_search_deferred(
|
||||||
queue, task_id, lease_token, subscribe.name, deferred, summary.record
|
queue, task_id, lease_token, deferred, summary.record
|
||||||
)
|
)
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
logger.error(f"订阅 {subscribe.name} 搜索失败:{str(err)}", exc_info=True)
|
logger.error(f"订阅 {subscribe.name} 搜索失败:{str(err)}", exc_info=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user