engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

email: fixed logging on smtp library.

Browse source
This commit is contained in:
Marcin Kuzminski 2018-05-28 18:12:58 +02:00
parent a67bf9ced2
commit 998cfa7aaa
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/python-packages.nix
View file

@ -1455,7 +1455,7 @@
sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
};
meta = {
license = [ pkgs.lib.licenses.bsdOriginal { fullName = "Simplified BSD"; } ];
license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
};
};
python-editor = super.buildPythonPackage {
@ -1790,7 +1790,7 @@
sha256 = "0d5337839c788da5900df70f8e01015aec141aa3fe7936cb0d0a2953f7ac7609";
};
meta = {
license = [ pkgs.lib.licenses.mit ];
license = [ ];
};
};
traitlets = super.buildPythonPackage {

7
rhodecode/lib/rcmail/smtp_mailer.py
View file

@ -33,7 +33,8 @@ log = logging.getLogger(__name__)
class SmtpMailer(object):
"""SMTP mailer class
"""
SMTP mailer class
mailer = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth
mail_port, ssl, tls)
@ -83,7 +84,7 @@ class SmtpMailer(object):
recipients_separator=", ", extra_headers=headers)
raw_msg = msg.to_message()
#patched smtplib without stderr
# patched smtplib without stderr
smtplib = self._get_smptlib()
if self.ssl:
smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port,
@ -109,7 +110,7 @@ class SmtpMailer(object):
smtp_serv.login(self.user, self.passwd)
smtp_serv.sendmail(msg.sender, msg.send_to, raw_msg.as_string())
logging.info('MAIL SEND TO: %s' % recipients)
log.info('email sent to: %s' % recipients)
try:
smtp_serv.quit()