Issue #16168: Merged SysLogHandler update from 3.2.

vsajip · vsajip · commit 7903df412518 · 2012-10-09T08:22:01.000+01:00
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
@@ -794,18 +794,12 @@ def __init__(self, address=('localhost', SYSLOG_UDP_PORT),
         self.formatter = None
 
     def _connect_unixsocket(self, address):
-        self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
-        # syslog may require either DGRAM or STREAM sockets
+        self.socket = socket.socket(socket.AF_UNIX, self.socktype)
         try:
             self.socket.connect(address)
         except socket.error:
             self.socket.close()
-            self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            try:
-                self.socket.connect(address)
-            except socket.error:
-                self.socket.close()
-                raise
+            raise
 
     def encodePriority(self, facility, priority):
         """
