summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-05-16 22:02:54 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-05-16 22:02:54 (GMT)
commit3a8f510b52b5287b2cba2b720f657073b8ffc719 (patch)
tree5202b21b8582dba11ecb0814c78f54d4ec6e0914
parent43b2ab96bc63f037bd7e1504241c2feaef684fc6 (diff)
parent862b15e7d0402d3aabe224ca33e45f4e9aa6dd00 (diff)
downloadcpython-3a8f510b52b5287b2cba2b720f657073b8ffc719.zip
cpython-3a8f510b52b5287b2cba2b720f657073b8ffc719.tar.gz
cpython-3a8f510b52b5287b2cba2b720f657073b8ffc719.tar.bz2
Closes #17981: Merged fix from 3.3.
-rw-r--r--Lib/logging/handlers.py1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index bed09f0..f1ddbb5 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -876,6 +876,7 @@ class SysLogHandler(logging.Handler):
try:
self.socket.send(msg)
except OSError:
+ self.socket.close()
self._connect_unixsocket(self.address)
self.socket.send(msg)
elif self.socktype == socket.SOCK_DGRAM:
diff --git a/Misc/NEWS b/Misc/NEWS
index ceab576..953d57e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,8 @@ Core and Builtins
Library
-------
+- Issue #17981: Closed socket on error in SysLogHandler.
+
- Issue #17964: Fix os.sysconf(): the return type of the C sysconf() function
is long, not int.