Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Closes #14314: backported fix.

This commit is contained in:
Vinay Sajip 2012-03-23 14:33:00 +00:00
parent ea605cd152
commit 50d6f54b1a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/logging/handlers.py
View File

@ -868,6 +868,7 @@ class SMTPHandler(logging.Handler):
self.toaddrs = toaddrs self.toaddrs = toaddrs
self.subject = subject self.subject = subject
self.secure = secure self.secure = secure
self._timeout = 5.0
def getSubject(self, record): def getSubject(self, record):
""" """
@ -890,7 +891,7 @@ class SMTPHandler(logging.Handler):
port = self.mailport port = self.mailport
if not port: if not port:
port = smtplib.SMTP_PORT port = smtplib.SMTP_PORT
smtp = smtplib.SMTP(self.mailhost, port) smtp = smtplib.SMTP(self.mailhost, port, timeout=self._timeout)
msg = self.format(record) msg = self.format(record)
msg = "From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\n\r\n%s" % ( msg = "From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\n\r\n%s" % (
self.fromaddr, self.fromaddr,