From 665a2bddef3fdfa47ad6ff5bf62fd43060ffa6ab Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Wed, 9 Feb 2022 02:57:53 +0000 Subject: [PATCH] Remove welcome email debugging --- apiserver/apiserver/api/utils.py | 2 +- apiserver/apiserver/api/utils_email.py | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py index de06a99..22cbd37 100644 --- a/apiserver/apiserver/api/utils.py +++ b/apiserver/apiserver/api/utils.py @@ -346,7 +346,7 @@ def register_user(data, user): if data['request_id']: utils_stats.set_progress(data['request_id'], 'Sending welcome email...') try: utils_email.send_welcome_email(user.member) - except BaseException as e: # TODO: remove, just for testing + except BaseException as e: msg = 'Problem sending welcome email: ' + str(e) logger.exception(msg) alert_tanner(msg) diff --git a/apiserver/apiserver/api/utils_email.py b/apiserver/apiserver/api/utils_email.py index 7a16d96..0aae5d2 100644 --- a/apiserver/apiserver/api/utils_email.py +++ b/apiserver/apiserver/api/utils_email.py @@ -30,17 +30,12 @@ def send_welcome_email(member): with open(EMAIL_DIR + 'welcome.html', 'r') as f: email_html = replace_fields(f.read()) - try: - send_mail( - subject='Welcome to Protospace!', - message=email_text, - from_email=None, # defaults to DEFAULT_FROM_EMAIL - recipient_list=[member.user.email, 'portal@tannercollin.com'], - html_message=email_html, - ) - - logger.info('Sent welcome email:\n' + email_text) - except smtplib.SMTPException as e: - msg = 'Problem sending welcome email to ' + member.user.email + ': ' + str(e) - utils.alert_tanner(msg) - logger.exception(msg) + send_mail( + subject='Welcome to Protospace!', + message=email_text, + from_email=None, # defaults to DEFAULT_FROM_EMAIL + recipient_list=[member.user.email], + html_message=email_html, + ) + + logger.info('Sent welcome email:\n' + email_text)