mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Closes #16168: Merged SysLogHandler update from 3.3.

Browse source
This commit is contained in:
Vinay Sajip 2012-10-09 08:23:06 +01:00
commit 6978d58e18
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/logging/handlers.py
View file

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