From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 23 Feb 2012 20:03:49 +0000 (+0000)
Subject: Merged logging flush/close changes from 3.2.
X-Git-Tag: v3.3.0a1~81^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57c223791de6edb7fd302bd682630ab1e259a06b;p=thirdparty%2FPython%2Fcpython.git

Merged logging flush/close changes from 3.2.
---

57c223791de6edb7fd302bd682630ab1e259a06b
diff --cc Lib/logging/handlers.py
index 822b4efc7c4f,9fea2e8bf37c..0107853cfa8b
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@@ -792,8 -752,10 +792,9 @@@ class SysLogHandler(logging.Handler)
          """
          Closes the socket.
          """
-         self.socket.close()
-         logging.Handler.close(self)
+         with self.lock:
 -            if self.unixsocket:
 -                self.socket.close()
++            self.socket.close()
+             logging.Handler.close(self)
  
      def mapPriority(self, levelName):
          """