From: Vinay Sajip Date: Fri, 23 Mar 2012 14:33:00 +0000 (+0000) Subject: Closes #14314: backported fix. X-Git-Tag: v2.7.4rc1~948 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50d6f54b1aae4aadf6f080148ec2858663312cd7;p=python Closes #14314: backported fix. --- diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index d140048a74..3ff324d143 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -868,6 +868,7 @@ class SMTPHandler(logging.Handler): self.toaddrs = toaddrs self.subject = subject self.secure = secure + self._timeout = 5.0 def getSubject(self, record): """ @@ -890,7 +891,7 @@ class SMTPHandler(logging.Handler): port = self.mailport if not 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 = "From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\n\r\n%s" % ( self.fromaddr,