From eb28a7322bcf50e003db59aa962e7d8a4adbcb5c Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:20:09 +0200 Subject: [PATCH] fix(Email Account): handle errors during error handling --- frappe/email/doctype/email_account/email_account.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index bffccfd07f..aac4a97587 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -599,10 +599,15 @@ class EmailAccount(Document): frappe.db.rollback() except Exception: frappe.db.rollback() - self.log_error(title="EmailAccount.receive") - if self.use_imap: - self.handle_bad_emails(mail.uid, mail.raw_message, frappe.get_traceback()) - exceptions.append(frappe.get_traceback()) + try: + self.log_error(title="EmailAccount.receive") + if self.use_imap: + self.handle_bad_emails(mail.uid, mail.raw_message, frappe.get_traceback()) + exceptions.append(frappe.get_traceback()) + except Exception: + frappe.db.rollback() + else: + frappe.db.commit() else: frappe.db.commit()