Merged logging flush/close changes from 3.2.

Lib/logging/__init__.py

@@ -16,9 +16,9 @@
 
 """
 Logging package for Python. Based on PEP 282 and comments thereto in
-comp.lang.python, and influenced by Apache's log4j system.
+comp.lang.python.
 
-Copyright (C) 2001-2011 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved.
 
 To use, simply 'import logging' and log away!
 """
@@ -914,6 +914,7 @@ class StreamHandler(Handler):
         """
         Flushes the stream.
         """
+        with self.lock:
             if self.stream and hasattr(self.stream, "flush"):
                 self.stream.flush()
 
@@ -964,6 +965,7 @@ class FileHandler(StreamHandler):
         """
         Closes the stream.
         """
+        with self.lock:
             if self.stream:
                 self.flush()
                 if hasattr(self.stream, "close"):

Lib/logging/handlers.py

-# Copyright 2001-2010 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and its
 # documentation for any purpose and without fee is hereby granted,
@@ -16,10 +16,9 @@
 
 """
 Additional handlers for the logging package for Python. The core package is
-based on PEP 282 and comments thereto in comp.lang.python, and influenced by
-Apache's log4j system.
+based on PEP 282 and comments thereto in comp.lang.python.
 
-Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved.
 
 To use, simply 'import logging.handlers' and log away!
 """
@@ -594,6 +593,7 @@ class SocketHandler(logging.Handler):
         """
         Closes the socket.
         """
+        with self.lock:
             if self.sock:
                 self.sock.close()
                 self.sock = None
@@ -792,6 +792,7 @@ class SysLogHandler(logging.Handler):
         """
         Closes the socket.
         """
+        with self.lock:
             self.socket.close()
             logging.Handler.close(self)
 
@@ -1137,6 +1138,7 @@ class BufferingHandler(logging.Handler):
 
         This version just zaps the buffer to empty.
         """
+        with self.lock:
             self.buffer = []
 
     def close(self):
@@ -1187,6 +1189,7 @@ class MemoryHandler(BufferingHandler):
 
         The record buffer is also cleared by this operation.
         """
+        with self.lock:
             if self.target:
                 for record in self.buffer:
                     self.target.handle(record)
@@ -1197,6 +1200,7 @@ class MemoryHandler(BufferingHandler):
         Flush, set the target to None and lose the buffer.
         """
         self.flush()
+        with self.lock:
             self.target = None
             BufferingHandler.close(self)