Description: try / except around mail functions add try / except around mail functions to prevent python errors messages Author: Jörg Frings-Fürst Forwarded: via mail Applied-Upstream: Reviewed-by: Last-Update: 2014-05-22 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/mwc.py =================================================================== --- trunk.orig/mwc.py +++ trunk/mwc.py @@ -212,15 +212,27 @@ def sendmail(receiver, subject, content, mail['Subject'] = Header(subject, defaultEncoding) # initialize session once, not each time this method gets called - if mailsession is None: - mailsession = smtplib.SMTP(config.smtphost, config.smtpport) - if config.useTLS: - mailsession.ehlo() - mailsession.starttls() - mailsession.login(config.smtpusername, config.smtppwd) - - mailsession.sendmail(config.sender, receiver.split(','), mail.as_string()) - + # + # add try / except to open mailsession + # + try: + if mailsession is None: + mailsession = smtplib.SMTP(config.smtphost, config.smtpport) + if config.useTLS: + mailsession.ehlo() + mailsession.starttls() + mailsession.login(config.smtpusername, config.smtppwd) + # + # add try / except to send mail + # + except: + print('Error: Open smtp-session') + exit(4) + try: + mailsession.sendmail(config.sender, receiver.split(','), mail.as_string()) + except: + print('Error: sendmail') + exit(5) # returns a list of all content that is stored locally for a specific site def getFileContents(shortname):