From 024ae7a28665950a6d5c194edc0a3b94110684c2 Mon Sep 17 00:00:00 2001 From: Eric Rasche Date: Tue, 12 Apr 2016 23:40:39 +0000 Subject: [PATCH] bail earlier if no SMTP server is configured --- lib/galaxy/util/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py index 3478801d726..c5e6ab71dd9 100644 --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -1209,15 +1209,16 @@ def send_mail( frm, to, subject, body, config ): """ Sends an email. """ + if config.smtp_server is None: + log.error( "Mail is not configured for this Galaxy instance." ) + log.info( msg ) + return + to = listify( to ) msg = email_mime_text.MIMEText( body.encode( 'ascii', 'replace' ) ) msg[ 'To' ] = ', '.join( to ) msg[ 'From' ] = frm msg[ 'Subject' ] = subject - if config.smtp_server is None: - log.error( "Mail is not configured for this Galaxy instance." ) - log.info( msg ) - return smtp_ssl = asbool( getattr(config, 'smtp_ssl', False ) ) if smtp_ssl: s = smtplib.SMTP_SSL()