Issue #16168: Use specified socket type for domain sockets in SysLogHandler.

6ecdb581 · Vinay Sajip · 1906c0c9 · 6ecdb581
Commit 6ecdb581 authored Oct 09, 2012 by Vinay Sajip
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

Lib/logging/handlers.py Lib/logging/handlers.py +2 -8

No files found.
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -764,13 +764,7 @@ class SysLogHandler(logging.Handler):
        self.formatter = None
    def _connect_unixsocket(self, address):
-        self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
+        self.socket = socket.socket(socket.AF_UNIX, self.socktype)
-        # syslog may require either DGRAM or STREAM sockets
-        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: