]> granicus.if.org Git - python/commitdiff
Closes #14314: backported fix.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 23 Mar 2012 14:33:00 +0000 (14:33 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 23 Mar 2012 14:33:00 +0000 (14:33 +0000)
Lib/logging/handlers.py

index d140048a7449f6ccd9ea794c6c43f4268b6c00b6..3ff324d1436bc8869ef7cb9a56fbf60e55a7fea2 100644 (file)
@@ -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,