tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Catch exception before the cron transaction is ended

Browse Source 
To rollback the transaction must be done before the context manager calls stop
on exit.

Closes #13149
(grafted from 02ef3e349808c73a260ab7e83fea4eb66f37bd02)

--HG--
branch : 7.0
This commit is contained in:
Cédric Krier
2024-04-01 16:18:13 +02:00
parent c52843b183
commit 3a579caff2
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trytond/trytond/ir/cron.py
+22 -20
View File
@@ -185,26 +185,28 @@ class Cron(DeactivableMixin, ModelSQL, ModelView):
with processing(name), \
transaction.new_transaction(
**transaction_extras) as cron_trans:
cron.run_once()
cron_trans.commit()
except Exception as e:
if isinstance(e, TransactionError):
cron_trans.rollback()
e.fix(transaction_extras)
continue
if (isinstance(e, backend.DatabaseOperationalError)
and count < retry):
cron_trans.rollback()
count += 1
logger.debug("Retry: %i", count)
continue
if isinstance(e, (UserError, UserWarning)):
Error.report(cron, e)
logger.info(
"%s failed after %i ms", name, duration())
else:
logger.exception(
"%s failed after %i ms", name, duration())
try:
cron.run_once()
cron_trans.commit()
except TransactionError as e:
cron_trans.rollback()
e.fix(transaction_extras)
continue
except backend.DatabaseOperationalError:
if count < retry:
cron_trans.rollback()
count += 1
logger.debug("Retry: %i", count)
continue
else:
raise
except (UserError, UserWarning) as e:
Error.report(cron, e)
logger.info(
"%s failed after %i ms", name, duration())
except Exception:
logger.exception(
"%s failed after %i ms", name, duration())
cron.next_call = cron.compute_next_call(now)
cron.save()
break