From 81db025e8c95531e5ca5e41b33915727f122e529 Mon Sep 17 00:00:00 2001
From: Jared Esparza <jared.esparza@nan-tic.com>
Date: Wed, 15 Dec 2021 17:31:35 +0100
Subject: [PATCH] Add worker_logger.diff | #048235

---
 series             |  4 +++-
 worker_logger.diff | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 worker_logger.diff

diff --git a/series b/series
index 87d7bb5..af0cdf0 100644
--- a/series
+++ b/series
@@ -109,4 +109,6 @@ issue10680.diff # [product] Fix get_template in reference field case
 
 issue10845.diff # [commission] Do not reverse commission when canceling invoice with move
 
-project_work_company_rule.diff # [project] Add company rule at project level [#048280]
\ No newline at end of file
+project_work_company_rule.diff # [project] Add company rule at project level [#048280]
+
+worker_logger.diff #[trytond] Move exception handling into transaction to keep the database name
\ No newline at end of file
diff --git a/worker_logger.diff b/worker_logger.diff
new file mode 100644
index 0000000..a4809b4
--- /dev/null
+++ b/worker_logger.diff
@@ -0,0 +1,20 @@
+diff --git a/trytond/trytond/worker.py b/trytond/trytond/worker.py
+index 854d1fc4..3442a97b 100644
+--- a/trytond/trytond/worker.py
++++ b/trytond/trytond/worker.py
+@@ -120,6 +120,9 @@ def run_task(pool, task_id):
+                         transaction.rollback()
+                         continue
+                     raise
++                except Exception:
++                    logger.critical('task "%d" failed', task_id, exc_info=True)
++                    return
+         logger.info('task "%d" done', task_id)
+     except DatabaseOperationalError:
+         try:
+@@ -132,5 +135,3 @@ def run_task(pool, task_id):
+         except Exception:
+             logger.critical(
+                 'rescheduling task "%d" failed', task_id, exc_info=True)
+-    except Exception:
+-        logger.critical('task "%d" failed', task_id, exc_info=True)