Fix negative expires_ms and avoid worker freezing while using cron (python-arq#479)

Matvey-Kuk · web-flow · commit 3bacb07c927c · 2025-01-06T09:31:56.000-05:00
diff --git a/arq/worker.py b/arq/worker.py
@@ -753,7 +753,12 @@ async def run_cron(self, n: datetime, delay: float, num_windows: int = 2) -> Non
                     job_id = f'{cron_job.name}:{to_unix_ms(cron_job.next_run)}' if cron_job.unique else None
                 job_futures.add(
                     self.pool.enqueue_job(
-                        cron_job.name, _job_id=job_id, _queue_name=self.queue_name, _defer_until=cron_job.next_run
+                        cron_job.name,
+                        _job_id=job_id,
+                        _queue_name=self.queue_name,
+                        _defer_until=(
+                            cron_job.next_run if cron_job.next_run > datetime.now(tz=self.timezone) else None
+                        ),
                     )
                 )
                 cron_job.calculate_next(cron_job.next_run)

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,12 @@ async def run_cron(self, n: datetime, delay: float, num_windows: int = 2) -> Non`
`753`	`753`	`job_id = f'{cron_job.name}:{to_unix_ms(cron_job.next_run)}' if cron_job.unique else None`
`754`	`754`	`job_futures.add(`
`755`	`755`	`self.pool.enqueue_job(`
`756`		`- cron_job.name, _job_id=job_id, _queue_name=self.queue_name, _defer_until=cron_job.next_run`
	`756`	`+ cron_job.name,`
	`757`	`+ _job_id=job_id,`
	`758`	`+ _queue_name=self.queue_name,`
	`759`	`+ _defer_until=(`
	`760`	`+ cron_job.next_run if cron_job.next_run > datetime.now(tz=self.timezone) else None`
	`761`	`+ ),`
`757`	`762`	`)`
`758`	`763`	`)`
`759`	`764`	`cron_job.calculate_next(cron_job.next_run)`