Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Vinay Sajip 2012-10-09 08:17:41 +01:00
parent 1906c0c992
commit 6ecdb58154
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/logging/handlers.py
View File

@ -764,18 +764,12 @@ class SysLogHandler(logging.Handler):
self.formatter = None self.formatter = None
def _connect_unixsocket(self, address): 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: try:
self.socket.connect(address) self.socket.connect(address)
except socket.error: except socket.error:
self.socket.close() self.socket.close()
self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) raise
try:
self.socket.connect(address)
except socket.error:
self.socket.close()
raise
# curious: when talking to the unix-domain '/dev/log' socket, a # curious: when talking to the unix-domain '/dev/log' socket, a
# zero-terminator seems to be required. this string is placed # zero-terminator seems to be required. this string is placed