From 97f20e29e7f7b98e0f9e9c78fbdd8f2ebf63760e Mon Sep 17 00:00:00 2001 From: Jose Zambudio Date: Mon, 18 Aug 2025 11:47:31 +0200 Subject: [PATCH 1/2] fix(queue.job): Handle zero max_retries in job retry logic --- queue_job/jobrunner/runner.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/queue_job/jobrunner/runner.py b/queue_job/jobrunner/runner.py index 48bf51020e..a0db6751db 100644 --- a/queue_job/jobrunner/runner.py +++ b/queue_job/jobrunner/runner.py @@ -333,6 +333,7 @@ def _query_requeue_dead_jobs(self): CASE WHEN max_retries IS NOT NULL AND + max_retries != 0 AND -- infinite retries if max_retries is 0 retry IS NOT NULL AND retry>max_retries THEN 'failed' @@ -347,6 +348,7 @@ def _query_requeue_dead_jobs(self): CASE WHEN max_retries IS NOT NULL AND + max_retries != 0 AND -- infinite retries if max_retries is 0 retry IS NOT NULL AND retry>max_retries THEN 'JobFoundDead' @@ -356,6 +358,7 @@ def _query_requeue_dead_jobs(self): CASE WHEN max_retries IS NOT NULL AND + max_retries != 0 AND -- infinite retries if max_retries is 0 retry IS NOT NULL AND retry>max_retries THEN 'Job found dead after too many retries' From 357fbd0195775b2cf0a4a0dc6b97cec6696a692a Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 20 Aug 2025 07:43:59 +0000 Subject: [PATCH 2/2] [BOT] post-merge updates --- README.md | 2 +- queue_job/README.rst | 2 +- queue_job/__manifest__.py | 2 +- queue_job/static/description/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 789d0796b1..cdf5dd44f1 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Available addons addon | version | maintainers | summary --- | --- | --- | --- [base_import_async](base_import_async/) | 17.0.1.0.0 | | Import CSV files in the background -[queue_job](queue_job/) | 17.0.1.4.1 | guewen | Job Queue +[queue_job](queue_job/) | 17.0.1.4.2 | guewen | Job Queue [queue_job_cron](queue_job_cron/) | 17.0.1.1.0 | | Scheduled Actions as Queue Jobs [queue_job_cron_jobrunner](queue_job_cron_jobrunner/) | 17.0.1.1.0 | ivantodorovich | Run jobs without a dedicated JobRunner [queue_job_subscribe](queue_job_subscribe/) | 17.0.1.0.0 | | Control which users are subscribed to queue job notifications diff --git a/queue_job/README.rst b/queue_job/README.rst index f5a0ba7971..16c0e45d34 100644 --- a/queue_job/README.rst +++ b/queue_job/README.rst @@ -11,7 +11,7 @@ Job Queue !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:2c31d188cc0a4807a84d0df3880eeeabd76d2cfbbbc09f0e347910352b472127 + !! source digest: sha256:1e255eae2042abbd08d870b684c443f75624a6e639b7472f169e755fb6d8ab99 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py index 63cc69e79e..34d9575904 100644 --- a/queue_job/__manifest__.py +++ b/queue_job/__manifest__.py @@ -2,7 +2,7 @@ { "name": "Job Queue", - "version": "17.0.1.4.1", + "version": "17.0.1.4.2", "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/queue", "license": "LGPL-3", diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html index 19da409c8b..8b208cffce 100644 --- a/queue_job/static/description/index.html +++ b/queue_job/static/description/index.html @@ -372,7 +372,7 @@

Job Queue

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:2c31d188cc0a4807a84d0df3880eeeabd76d2cfbbbc09f0e347910352b472127 +!! source digest: sha256:1e255eae2042abbd08d870b684c443f75624a6e639b7472f169e755fb6d8ab99 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Mature License: LGPL-3 OCA/queue Translate me on Weblate Try me on Runboat

This addon adds an integrated Job Queue to Odoo.