mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-30378: Fix the problem that SysLogHandler can't handle IPv6 addresses (#1676)

Browse source
This commit is contained in:
Xiang Zhang 2017-06-01 21:11:56 +08:00 • committed by GitHub
parent 4e624ca50a
commit 0b4b57df96
3 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/logging/handlers.py
View file

@ -827,11 +827,26 @@ class SysLogHandler(logging.Handler):
self.unixsocket = False
if socktype is None:
socktype = socket.SOCK_DGRAM
self.socket = socket.socket(socket.AF_INET, socktype)
if socktype == socket.SOCK_STREAM:
self.socket.connect(address)
host, port = address
ress = socket.getaddrinfo(host, port, 0, socktype)
if not ress:
raise OSError("getaddrinfo returns an empty list")
for res in ress:
af, socktype, proto, _, sa = res
err = sock = None
try:
sock = socket.socket(af, socktype, proto)
if socktype == socket.SOCK_STREAM:
sock.connect(sa)
break
except OSError as exc:
err = exc
if sock is not None:
sock.close()
if err is not None:
raise err
self.socket = sock
self.socktype = socktype
self.formatter = None
def _connect_unixsocket(self, address):
use_socktype = self.socktype
@ -870,7 +885,7 @@ class SysLogHandler(logging.Handler):
priority = self.priority_names[priority]
return (facility << 3) | priority
def close (self):
def close(self):
"""
Closes the socket.
"""