Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-11 05:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #587 (Better handling of errors in sending email)

Browse Source
This commit is contained in:
OzzieIsaacs 2018-09-02 08:41:09 +02:00
parent c3b0492834
commit 4dd6c55c38
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cps/worker.py
View File

@ -403,15 +403,14 @@ class WorkerThread(threading.Thread):
msg['To'] = obj['recipent'] msg['To'] = obj['recipent']
use_ssl = int(obj['settings'].get('mail_use_ssl', 0)) use_ssl = int(obj['settings'].get('mail_use_ssl', 0))
# convert MIME message to string
fp = StringIO()
gen = Generator(fp, mangle_from_=False)
gen.flatten(msg)
msg = fp.getvalue()
# send email
try: try:
# convert MIME message to string
fp = StringIO()
gen = Generator(fp, mangle_from_=False)
gen.flatten(msg)
msg = fp.getvalue()
# send email
timeout = 600 # set timeout to 5mins timeout = 600 # set timeout to 5mins
org_stderr = sys.stderr org_stderr = sys.stderr
@ -441,9 +440,17 @@ class WorkerThread(threading.Thread):
sys.stderr = org_stderr sys.stderr = org_stderr
except (socket.error, smtplib.SMTPRecipientsRefused, smtplib.SMTPException) as e: except (MemoryError) as e:
self._handleError(e) self._handleError(u'Error sending email: ' + e.message)
return None return None
except (smtplib.SMTPException) as e:
self._handleError(u'Error sending email: ' + e.smtp_error.replace("\n",'. '))
return None
except (socket.error) as e:
self._handleError(u'Error sending email: ' + e.strerror)
return None
def _formatRuntime(self, runtime): def _formatRuntime(self, runtime):
self.UIqueue[self.current]['rt'] = runtime.total_seconds() self.UIqueue[self.current]['rt'] = runtime.total_seconds()