paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

send_email: Don't abort on an EmailNotDeliveredException.

Browse Source 
It is better to press on, than stop halfway through due to a user
whose email no longer works.  The exception is already logged, which
is sufficient here, as this is generally run interactively.
This commit is contained in:
Alex Vandiver
2021-12-14 15:09:37 -08:00
committed by Tim Abbott
parent 45736aea3c
commit 4b1fd209be
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/lib/send_email.py
View File

@@ -549,17 +549,20 @@ def send_custom_email(users: List[UserProfile], options: Dict[str, Any]) -> None
"realm_name": user_profile.realm.name,
"unsubscribe_link": one_click_unsubscribe_link(user_profile, "marketing"),
}
send_email(
email_id,
to_user_ids=[user_profile.id],
from_address=FromAddress.SUPPORT,
reply_to_email=options.get("reply_to"),
from_name=get_header(
options.get("from_name"), parsed_email_template.get("from"), "from_name"
),
context=context,
dry_run=options["dry_run"],
)
try:
send_email(
email_id,
to_user_ids=[user_profile.id],
from_address=FromAddress.SUPPORT,
reply_to_email=options.get("reply_to"),
from_name=get_header(
options.get("from_name"), parsed_email_template.get("from"), "from_name"
),
context=context,
dry_run=options["dry_run"],
)
except EmailNotDeliveredException:
pass
if options["dry_run"]:
break