[Python-checkins] cpython (merge 3.3 -> default): Closes #17981: Merged fix from 3.3.

[vinay.sajip]

http://hg.python.org/cpython/rev/f2809c7a7c3c
changeset:   83799:f2809c7a7c3c
parent:      83796:a3559c8c614b
parent:      83798:590b865aa73c
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Thu May 16 23:02:54 2013 +0100
summary:
  Closes #17981: Merged fix from 3.3.

files:
  Lib/logging/handlers.py |  1 +
  Misc/NEWS               |  2 ++
  2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -876,6 +876,7 @@
                 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,8 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython