Issue #16168: Merged SysLogHandler update from 3.2.

This commit is contained in:
Vinay Sajip 2012-10-09 08:22:01 +01:00
commit 7903df4125
1 changed files with 2 additions and 8 deletions

View File

@ -794,18 +794,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
def encodePriority(self, facility, priority):
"""