From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 7 May 2011 14:55:47 +0000 (+0100)
Subject: Changed where socket close is called on connection failure.
X-Git-Tag: v3.3.0a1~2371^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b37cd392028ec395dccc63e57cd43133cb274f8d;p=python

Changed where socket close is called on connection failure.
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 7296472293..a0b53e8588 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -446,8 +446,12 @@ class SocketHandler(logging.Handler):
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         if hasattr(s, 'settimeout'):
             s.settimeout(timeout)
-        s.connect((self.host, self.port))
-        return s
+        try:
+            s.connect((self.host, self.port))
+            return s
+        except socket.error:
+            s.close()
+            raise
 
     def createSocket(self):
         """
@@ -469,9 +473,6 @@ class SocketHandler(logging.Handler):
                 self.retryTime = None # next time, no delay before trying
             except socket.error:
                 #Creation failed, so set the retry time and return.
-                if self.sock is not None:
-                    self.sock.close()
-                    self.sock = None
                 if self.retryTime is None:
                     self.retryPeriod = self.retryStart
                 else: