]> granicus.if.org Git - python/commitdiff
Merged logging flush/close changes from 3.2.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:03:49 +0000 (20:03 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:03:49 +0000 (20:03 +0000)
1  2 
Lib/logging/__init__.py
Lib/logging/handlers.py

Simple merge
index 822b4efc7c4f7c7395e3c6fa2f22dfc52c797d01,9fea2e8bf37cfb11d68947d6dcaaa2b69acd158e..0107853cfa8b01673e97b16674d91e25c218c435
@@@ -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):
          """