Skip to content

Commit a04ea9b

Browse files
committed
[MIG] queue_job_cron_jobrunner: Migration to 18.0
1 parent 17ad576 commit a04ea9b

6 files changed

Lines changed: 19 additions & 29 deletions

File tree

queue_job_cron_jobrunner/README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Queue Job Cron Jobrunner
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github
20-
:target: https://github.com/OCA/queue/tree/17.0/queue_job_cron_jobrunner
20+
:target: https://github.com/OCA/queue/tree/18.0/queue_job_cron_jobrunner
2121
:alt: OCA/queue
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/queue-17-0/queue-17-0-queue_job_cron_jobrunner
23+
:target: https://translation.odoo-community.org/projects/queue-18-0/queue-18-0-queue_job_cron_jobrunner
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/queue&target_branch=17.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/queue&target_branch=18.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -98,7 +98,7 @@ Bug Tracker
9898
Bugs are tracked on `GitHub Issues <https://github.com/OCA/queue/issues>`_.
9999
In case of trouble, please check there if your issue has already been reported.
100100
If you spotted it first, help us to smash it by providing a detailed and welcomed
101-
`feedback <https://github.com/OCA/queue/issues/new?body=module:%20queue_job_cron_jobrunner%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
101+
`feedback <https://github.com/OCA/queue/issues/new?body=module:%20queue_job_cron_jobrunner%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
102102

103103
Do not contact contributors directly about support or help with technical issues.
104104

@@ -138,6 +138,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
138138

139139
|maintainer-ivantodorovich|
140140

141-
This module is part of the `OCA/queue <https://github.com/OCA/queue/tree/17.0/queue_job_cron_jobrunner>`_ project on GitHub.
141+
This module is part of the `OCA/queue <https://github.com/OCA/queue/tree/18.0/queue_job_cron_jobrunner>`_ project on GitHub.
142142

143143
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

queue_job_cron_jobrunner/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Queue Job Cron Jobrunner",
33
"summary": "Run jobs without a dedicated JobRunner",
4-
"version": "17.0.1.0.0",
4+
"version": "18.0.1.0.0",
55
"development_status": "Alpha",
66
"author": "Camptocamp SA, Odoo Community Association (OCA)",
77
"maintainers": ["ivantodorovich"],

queue_job_cron_jobrunner/data/ir_cron.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
<field name="user_id" ref="base.user_root" />
1010
<field name="interval_number">1</field>
1111
<field name="interval_type">days</field>
12-
<field name="numbercall">-1</field>
1312
</record>
1413
</odoo>

queue_job_cron_jobrunner/models/queue_job.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88

99
from psycopg2 import OperationalError
1010

11-
from odoo import _, api, models, tools
11+
from odoo import api, models, tools
1212
from odoo.service.model import PG_CONCURRENCY_ERRORS_TO_RETRY
1313

1414
from odoo.addons.queue_job.controllers.main import PG_RETRY
15-
from odoo.addons.queue_job.exception import (
16-
FailedJobError,
17-
NothingToDoJob,
18-
RetryableJobError,
19-
)
15+
from odoo.addons.queue_job.exception import FailedJobError, RetryableJobError
2016
from odoo.addons.queue_job.job import Job
2117

2218
_logger = logging.getLogger(__name__)
@@ -79,14 +75,6 @@ def _process(self, commit=False):
7975
job.store()
8076
_logger.debug("%s OperationalError, postponed", job)
8177

82-
except NothingToDoJob as err:
83-
if str(err):
84-
msg = str(err)
85-
else:
86-
msg = _("Job interrupted and set to Done: nothing to do.")
87-
job.set_done(msg)
88-
job.store()
89-
9078
except RetryableJobError as err:
9179
# delay the job later, requeue
9280
job.postpone(result=str(err), seconds=5)

queue_job_cron_jobrunner/static/description/index.html

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
/*
1010
:Author: David Goodger (goodger@python.org)
11-
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
11+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
1212
:Copyright: This stylesheet has been placed in the public domain.
1313
1414
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1516
1617
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1718
customize this style sheet.
@@ -274,7 +275,7 @@
274275
margin-left: 2em ;
275276
margin-right: 2em }
276277

277-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
278279
pre.code, code { background-color: #eeeeee }
279280
pre.code .comment, code .comment { color: #5C6576 }
280281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
300301
span.pre {
301302
white-space: pre }
302303

303-
span.problematic {
304+
span.problematic, pre.problematic {
304305
color: red }
305306

306307
span.section-subtitle {
@@ -368,7 +369,7 @@ <h1 class="title">Queue Job Cron Jobrunner</h1>
368369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369370
!! source digest: sha256:a9ff3bc27cff35398d24b6b1dc300a5b8acc9c06d417b1969b1c2e2974e39ec9
370371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
371-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/17.0/queue_job_cron_jobrunner"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-17-0/queue-17-0-queue_job_cron_jobrunner"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/18.0/queue_job_cron_jobrunner"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-18-0/queue-18-0-queue_job_cron_jobrunner"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372373
<p>This module implements a simple <tt class="docutils literal">queue.job</tt> runner using <tt class="docutils literal">ir.cron</tt>
373374
triggers.</p>
374375
<p>It’s meant to be used on environments where the regular job runner can’t
@@ -440,7 +441,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
440441
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/queue/issues">GitHub Issues</a>.
441442
In case of trouble, please check there if your issue has already been reported.
442443
If you spotted it first, help us to smash it by providing a detailed and welcomed
443-
<a class="reference external" href="https://github.com/OCA/queue/issues/new?body=module:%20queue_job_cron_jobrunner%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
444+
<a class="reference external" href="https://github.com/OCA/queue/issues/new?body=module:%20queue_job_cron_jobrunner%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
444445
<p>Do not contact contributors directly about support or help with technical issues.</p>
445446
</div>
446447
<div class="section" id="credits">
@@ -466,13 +467,15 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
466467
<div class="section" id="maintainers">
467468
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
468469
<p>This module is maintained by the OCA.</p>
469-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
470+
<a class="reference external image-reference" href="https://odoo-community.org">
471+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
472+
</a>
470473
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
471474
mission is to support the collaborative development of Odoo features and
472475
promote its widespread use.</p>
473476
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
474477
<p><a class="reference external image-reference" href="https://github.com/ivantodorovich"><img alt="ivantodorovich" src="https://github.com/ivantodorovich.png?size=40px" /></a></p>
475-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/queue/tree/17.0/queue_job_cron_jobrunner">OCA/queue</a> project on GitHub.</p>
478+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/queue/tree/18.0/queue_job_cron_jobrunner">OCA/queue</a> project on GitHub.</p>
476479
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
477480
</div>
478481
</div>

queue_job_cron_jobrunner/views/ir_cron.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<field name="model">ir.cron</field>
1010
<field name="inherit_id" ref="base.ir_cron_view_form" />
1111
<field name="arch" type="xml">
12-
<field name="doall" position="after">
12+
<field name="priority" position="after">
1313
<field name="queue_job_runner" invisible="model_name != 'queue.job'" />
1414
</field>
1515
</field>

0 commit comments

Comments
 (0)