Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix exception when timing out trying to send notification email

Browse Source
This commit is contained in:
Andrew Resch 2009-05-13 20:52:51 +00:00
parent 96687a996b
commit 62a7fe4fc5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,6 +7,7 @@
* Fix high cpu usage when displaying speeds in titlebar * Fix high cpu usage when displaying speeds in titlebar
* Fix showing non-utf8 encoded torrents in add torrent dialog -- this adds * Fix showing non-utf8 encoded torrents in add torrent dialog -- this adds
an additional dependency on chardet. an additional dependency on chardet.
* Fix exception when timing out trying to send notification email
==== WebUI ==== ==== WebUI ====
* Fix starting when -l option is used * Fix starting when -l option is used

7
deluge/ui/gtkui/notification.py
View File

@ -115,7 +115,12 @@ class Notification:
port = 587 port = 587
elif self.config["ntf_security"] == None: elif self.config["ntf_security"] == None:
port = 25 port = 25
mailServer = smtplib.SMTP(self.config["ntf_server"], port) try:
mailServer = smtplib.SMTP(self.config["ntf_server"], port)
except Exception, e:
log.error("There was an error sending the notification email: %s", e)
return
if self.config["ntf_username"] and self.config["ntf_pass"]: if self.config["ntf_username"] and self.config["ntf_pass"]:
if self.config["ntf_security"] == 'SSL' or 'TLS': if self.config["ntf_security"] == 'SSL' or 'TLS':
mailServer.ehlo('x') mailServer.ehlo('x')