upgrade worker_logger patch to main

This commit is contained in:
Raimon Esteve 2022-08-17 13:29:18 +02:00
parent ea2aa60415
commit d21d99b789
1 changed files with 11 additions and 10 deletions

View File

@ -1,20 +1,21 @@
diff --git a/trytond/worker.py b/trytond/worker.py diff --git a/trytond/trytond/worker.py b/trytond/trytond/worker.py
index 4088e2b6..46393e92 100644 index b0d751fb..16070d9b 100644
--- a/trytond/trytond/worker.py --- a/trytond/trytond/worker.py
+++ b/trytond/trytond/worker.py +++ b/trytond/trytond/worker.py
@@ -126,6 +126,9 @@ def run_task(pool, task_id): @@ -143,6 +143,9 @@ def run_task(pool, task_id):
except (UserError, UserWarning) as e: except (UserError, UserWarning) as e:
Error.log(task, e) Error.log(task, e)
raise raise
+ except Exception: + except Exception:
+ logger.critical('%s failed', name, exc_info=True) + logger.critical('%s failed', name, exc_info=True)
+ return + return
logger.info('%s done', name) logger.info("%s in %i ms", name, duration())
except backend.DatabaseOperationalError: except backend.DatabaseOperationalError:
logger.info('%s failed, retrying', name, exc_info=True) logger.info(
@@ -146,5 +149,3 @@ def run_task(pool, task_id): @@ -170,6 +173,3 @@ def run_task(pool, task_id):
'rescheduling %s failed', name, exc_info=True) logger.info(
except (UserError, UserWarning): "%s failed after %i ms", name, duration(),
logger.info('%s failed', name) exc_info=logger.isEnabledFor(logging.DEBUG))
- except Exception: - except Exception:
- logger.critical('%s failed', name, exc_info=True) - logger.critical(
- "%s failed after %i ms", name, duration(), exc_info=True)