Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a safe logger when sending email

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-05 15:15:00 +05:30
parent b99fd3edc2
commit 0d11be0076
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/email.py
View File

@ -115,13 +115,19 @@ class Sendmail(object):
eto = [] eto = []
for x in to.split(','): for x in to.split(','):
eto.append(extract_email_address(x.strip())) eto.append(extract_email_address(x.strip()))
def safe_debug(*args, **kwargs):
try:
return log.debug(*args, **kwargs)
except Exception:
pass
sendmail(msg, efrom, eto, localhost=None, sendmail(msg, efrom, eto, localhost=None,
verbose=1, verbose=1,
relay=opts.relay_host, relay=opts.relay_host,
username=opts.relay_username, username=opts.relay_username,
password=unhexlify(opts.relay_password).decode('utf-8'), port=opts.relay_port, password=unhexlify(opts.relay_password).decode('utf-8'), port=opts.relay_port,
encryption=opts.encryption, encryption=opts.encryption,
debug_output=log.debug) debug_output=safe_debug)
finally: finally:
self.last_send_time = time.time() self.last_send_time = time.time()