heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include original error in debug log

Browse Source
This commit is contained in:
Jonathan Sandoval 2016-04-08 13:21:31 -05:00
parent caee9aa2e3
commit b2bc8e654e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/tools/mail.py
View File

@ -115,22 +115,22 @@ def send_email(from_addr, to_addrs, subject, message_body):
mhost = smtp_init( mhost = smtp_init(
mg_globals.app_config['email_smtp_host'], mg_globals.app_config['email_smtp_host'],
mg_globals.app_config['email_smtp_port']) mg_globals.app_config['email_smtp_port'])
except socket.error: except socket.error as original_error:
error_message = "Couldn't contact mail server on <{}>:<{}>".format( error_message = "Couldn't contact mail server on <{}>:<{}>".format(
mg_globals.app_config['email_smtp_host'], mg_globals.app_config['email_smtp_host'],
mg_globals.app_config['email_smtp_port']) mg_globals.app_config['email_smtp_port'])
logging.debug(error_message) logging.debug(original_error)
raise NoSMTPServerError(error_message) raise NoSMTPServerError(error_message)
# SMTP.__init__ Issues SMTP.connect implicitly if host # SMTP.__init__ Issues SMTP.connect implicitly if host
if not mg_globals.app_config['email_smtp_host']: # e.g. host = '' if not mg_globals.app_config['email_smtp_host']: # e.g. host = ''
try: try:
mhost.connect() # We SMTP.connect explicitly mhost.connect() # We SMTP.connect explicitly
except socket.error: except socket.error as original_error:
error_message = "Couldn't contact mail server on <{}>:<{}>".format( error_message = "Couldn't contact mail server on <{}>:<{}>".format(
mg_globals.app_config['email_smtp_host'], mg_globals.app_config['email_smtp_host'],
mg_globals.app_config['email_smtp_port']) mg_globals.app_config['email_smtp_port'])
logging.debug(error_message) logging.debug(original_error)
raise NoSMTPServerError(error_message) raise NoSMTPServerError(error_message)
try: try: