From 6d266b19af6fed6cbe4b112b2f1e3dca6a181711 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 28 Apr 2022 14:42:17 +0530 Subject: [PATCH] fix(minor): fix email error logging and strip Guest --- frappe/email/doctype/email_queue/email_queue.py | 4 +++- frappe/email/email_body.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/email/doctype/email_queue/email_queue.py b/frappe/email/doctype/email_queue/email_queue.py index 61d730829b..db2ca9e32b 100644 --- a/frappe/email/doctype/email_queue/email_queue.py +++ b/frappe/email/doctype/email_queue/email_queue.py @@ -622,11 +622,13 @@ class QueueBuilder: mail_to_string = cstr(mail.as_string()) except frappe.InvalidEmailAddressError: # bad Email Address - don't add to queue - self.log_error( + frappe.log_error( title="Invalid email address", message="Invalid email address Sender: {0}, Recipients: {1}, \nTraceback: {2} ".format( self.sender, ", ".join(self.final_recipients()), traceback.format_exc() ), + reference_doctype=self.reference_doctype, + reference_name=self.reference_name, ) return diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 07f698f740..adaad8db48 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -268,9 +268,9 @@ class EMail: self.replace_sender() self.replace_sender_name() - self.recipients = [strip(r) for r in self.recipients] - self.cc = [strip(r) for r in self.cc] - self.bcc = [strip(r) for r in self.bcc] + self.recipients = [strip(r) for r in self.recipients if r != "Guest"] + self.cc = [strip(r) for r in self.cc if r != "Guest"] + self.bcc = [strip(r) for r in self.bcc if r != "Guest"] for e in self.recipients + (self.cc or []) + (self.bcc or []): validate_email_address(e, True)