Compare commits
2 Commits
d9c95b1a9f
...
f9118994ff
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9118994ff | ||
|
|
3ce8c5bf90 |
@@ -139,7 +139,6 @@ celery_app.conf.update(
|
|||||||
"options": {
|
"options": {
|
||||||
"queue": IAAI_SYNC_QUEUE,
|
"queue": IAAI_SYNC_QUEUE,
|
||||||
"expires": settings.celery.beat_sync_interval_minutes * 60.0,
|
"expires": settings.celery.beat_sync_interval_minutes * 60.0,
|
||||||
"headers": {"iaai_beat_task": True},
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -875,9 +875,7 @@ def _mark_sync_completed(redis_client: Redis) -> None:
|
|||||||
logger.warning("Failed to mark sync completion timestamp", exc_info=True)
|
logger.warning("Failed to mark sync completion timestamp", exc_info=True)
|
||||||
|
|
||||||
|
|
||||||
def _seconds_until_next_allowed_sync(redis_client: Redis, settings: Settings, *, is_beat_task: bool = False) -> int:
|
def _seconds_until_next_allowed_sync(redis_client: Redis, settings: Settings) -> int:
|
||||||
if is_beat_task:
|
|
||||||
return 0
|
|
||||||
min_interval = max(0, int(settings.celery.beat_sync_interval_minutes * 60))
|
min_interval = max(0, int(settings.celery.beat_sync_interval_minutes * 60))
|
||||||
if min_interval <= 0:
|
if min_interval <= 0:
|
||||||
return 0
|
return 0
|
||||||
@@ -1343,7 +1341,6 @@ def sync_listing_task(
|
|||||||
0,
|
0,
|
||||||
int(os.getenv("IAAI_SYNC_FOLLOWUP_MIN_DELAY_SECONDS", str(settings.celery.beat_sync_interval_minutes * 60))),
|
int(os.getenv("IAAI_SYNC_FOLLOWUP_MIN_DELAY_SECONDS", str(settings.celery.beat_sync_interval_minutes * 60))),
|
||||||
)
|
)
|
||||||
is_beat_task = bool(self.request.headers and self.request.headers.get("iaai_beat_task"))
|
|
||||||
|
|
||||||
def _enqueue_bootstrap_followup(
|
def _enqueue_bootstrap_followup(
|
||||||
reason: str,
|
reason: str,
|
||||||
@@ -1426,7 +1423,7 @@ def sync_listing_task(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
next_allowed_delay = _seconds_until_next_allowed_sync(redis_client, settings, is_beat_task=is_beat_task)
|
next_allowed_delay = _seconds_until_next_allowed_sync(redis_client, settings)
|
||||||
if next_allowed_delay > 0:
|
if next_allowed_delay > 0:
|
||||||
logger.info(
|
logger.info(
|
||||||
"sync_listing_task skipped: previous full run finished recently; next run allowed in %ss",
|
"sync_listing_task skipped: previous full run finished recently; next run allowed in %ss",
|
||||||
|
|||||||
Reference in New Issue
Block a user