##// END OF EJS Templates
email: fixed logging on smtp library.
marcink -
r2773:de124c6d default
parent child Browse files
Show More
@@ -1455,7 +1455,7 b''
1455 sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
1455 sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
1456 };
1456 };
1457 meta = {
1457 meta = {
1458 license = [ pkgs.lib.licenses.bsdOriginal { fullName = "Simplified BSD"; } ];
1458 license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
1459 };
1459 };
1460 };
1460 };
1461 python-editor = super.buildPythonPackage {
1461 python-editor = super.buildPythonPackage {
@@ -1790,7 +1790,7 b''
1790 sha256 = "0d5337839c788da5900df70f8e01015aec141aa3fe7936cb0d0a2953f7ac7609";
1790 sha256 = "0d5337839c788da5900df70f8e01015aec141aa3fe7936cb0d0a2953f7ac7609";
1791 };
1791 };
1792 meta = {
1792 meta = {
1793 license = [ pkgs.lib.licenses.mit ];
1793 license = [ ];
1794 };
1794 };
1795 };
1795 };
1796 traitlets = super.buildPythonPackage {
1796 traitlets = super.buildPythonPackage {
@@ -33,7 +33,8 b' log = logging.getLogger(__name__)'
33
33
34
34
35 class SmtpMailer(object):
35 class SmtpMailer(object):
36 """SMTP mailer class
36 """
37 SMTP mailer class
37
38
38 mailer = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth
39 mailer = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth
39 mail_port, ssl, tls)
40 mail_port, ssl, tls)
@@ -83,7 +84,7 b' class SmtpMailer(object):'
83 recipients_separator=", ", extra_headers=headers)
84 recipients_separator=", ", extra_headers=headers)
84 raw_msg = msg.to_message()
85 raw_msg = msg.to_message()
85
86
86 #patched smtplib without stderr
87 # patched smtplib without stderr
87 smtplib = self._get_smptlib()
88 smtplib = self._get_smptlib()
88 if self.ssl:
89 if self.ssl:
89 smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port,
90 smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port,
@@ -109,7 +110,7 b' class SmtpMailer(object):'
109 smtp_serv.login(self.user, self.passwd)
110 smtp_serv.login(self.user, self.passwd)
110
111
111 smtp_serv.sendmail(msg.sender, msg.send_to, raw_msg.as_string())
112 smtp_serv.sendmail(msg.sender, msg.send_to, raw_msg.as_string())
112 logging.info('MAIL SEND TO: %s' % recipients)
113 log.info('email sent to: %s' % recipients)
113
114
114 try:
115 try:
115 smtp_serv.quit()
116 smtp_serv.quit()
General Comments 0
You need to be logged in to leave comments. Login now