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

Closes #17981: Merged fix from 3.3.

This commit is contained in:
Vinay Sajip 2013-05-16 23:02:54 +01:00
parent 43b2ab96bc 862b15e7d0
commit 3a8f510b52
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/logging/handlers.py
View File

@ -876,6 +876,7 @@ class SysLogHandler(logging.Handler):
try: try:
self.socket.send(msg) self.socket.send(msg)
except OSError: except OSError:
self.socket.close()
self._connect_unixsocket(self.address) self._connect_unixsocket(self.address)
self.socket.send(msg) self.socket.send(msg)
elif self.socktype == socket.SOCK_DGRAM: elif self.socktype == socket.SOCK_DGRAM:

2
Misc/NEWS
View File

@ -91,6 +91,8 @@ Core and Builtins
Library Library
------- -------
- Issue #17981: Closed socket on error in SysLogHandler.
- Issue #17964: Fix os.sysconf(): the return type of the C sysconf() function - Issue #17964: Fix os.sysconf(): the return type of the C sysconf() function
is long, not int. is long, not int.