From aa7b16a888eb53fdc4d7f194f3d49e6e8fe3ac24 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 9 Apr 2007 16:16:10 +0000
Subject: [PATCH] Added optional timeout to SocketHandler.makeSocket (SF
 #1695948)

---
 Lib/logging/handlers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index f877c15aea6..c713a11c26c 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -361,12 +361,14 @@ class SocketHandler(logging.Handler):
         self.retryMax = 30.0
         self.retryFactor = 2.0
 
-    def makeSocket(self):
+    def makeSocket(self, timeout=1):
         """
         A factory method which allows subclasses to define the precise
         type of socket they want.
         """
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        if hasattr(s, 'settimeout'):
+            s.settimeout(timeout)
         s.connect((self.host, self.port))
         return s