Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
erp5
Commits
760e47a9
Commit
760e47a9
authored
Mar 01, 2024
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Plain Diff
CMFActivity: do not bypass the max_retry parameter for activities that timeout
See merge request
nexedi/erp5!1880
parents
946b2e3a
e1378e37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
product/CMFActivity/Activity/SQLBase.py
product/CMFActivity/Activity/SQLBase.py
+2
-3
product/CMFActivity/tests/testCMFActivity.py
product/CMFActivity/tests/testCMFActivity.py
+0
-1
No files found.
product/CMFActivity/Activity/SQLBase.py
View file @
760e47a9
...
@@ -50,7 +50,7 @@ from Products.CMFActivity.ActivityRuntimeEnvironment import (
...
@@ -50,7 +50,7 @@ from Products.CMFActivity.ActivityRuntimeEnvironment import (
from
.Queue
import
Queue
,
VALIDATION_ERROR_DELAY
from
.Queue
import
Queue
,
VALIDATION_ERROR_DELAY
from
Products.CMFActivity.Errors
import
ActivityFlushError
from
Products.CMFActivity.Errors
import
ActivityFlushError
from
Products.ERP5Type
import
Timeout
from
Products.ERP5Type
import
Timeout
from
Products.ERP5Type.Timeout
import
TimeoutReachedError
,
Deadline
from
Products.ERP5Type.Timeout
import
Deadline
import
six
import
six
# Stop validating more messages when this limit is reached
# Stop validating more messages when this limit is reached
...
@@ -1094,8 +1094,7 @@ CREATE TABLE %s (
...
@@ -1094,8 +1094,7 @@ CREATE TABLE %s (
else
:
else
:
max_retry
=
m
.
max_retry
max_retry
=
m
.
max_retry
retry
=
m
.
line
.
retry
retry
=
m
.
line
.
retry
if
(
max_retry
is
not
None
and
retry
>=
max_retry
)
or
\
if
max_retry
is
not
None
and
retry
>=
max_retry
:
m
.
exc_type
==
TimeoutReachedError
:
# Always notify when we stop retrying.
# Always notify when we stop retrying.
notify_user_list
.
append
((
m
,
False
))
notify_user_list
.
append
((
m
,
False
))
final_error_uid_list
.
append
(
uid
)
final_error_uid_list
.
append
(
uid
)
...
...
product/CMFActivity/tests/testCMFActivity.py
View file @
760e47a9
...
@@ -2794,7 +2794,6 @@ return [x.getObject() for x in context.portal_catalog(limit=100)]
...
@@ -2794,7 +2794,6 @@ return [x.getObject() for x in context.portal_catalog(limit=100)]
with
self
.
assertRaises
(
RuntimeError
):
with
self
.
assertRaises
(
RuntimeError
):
self
.
tic
()
self
.
tic
()
message
,
=
self
.
getMessageList
(
'SQLDict'
)
message
,
=
self
.
getMessageList
(
'SQLDict'
)
self
.
assertEqual
(
message
.
retry
,
0
)
self
.
deleteMessageList
(
self
.
deleteMessageList
(
'SQLDict'
,
'SQLDict'
,
[
message
],
[
message
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment