From 6ecdb581544698830b2623f1f9e2c2c9baacd219 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Tue, 9 Oct 2012 08:17:41 +0100 Subject: Issue #16168: Use specified socket type for domain sockets in SysLogHandler. --- Lib/logging/handlers.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 19a5f10..dcb7fd2 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -764,18 +764,12 @@ class SysLogHandler(logging.Handler): 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 # curious: when talking to the unix-domain '/dev/log' socket, a # zero-terminator seems to be required. this string is placed -- cgit v0.12