[Python-checkins] cpython (merge 3.2 -> default): Merged logging flush/close changes from 3.2.
vinay.sajip
python-checkins at python.org
Thu Feb 23 21:04:48 CET 2012
http://hg.python.org/cpython/rev/cb9a2dff6240
changeset: 75212:cb9a2dff6240
parent: 75201:3828d93fd330
parent: 75211:b2adcd90e656
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Thu Feb 23 20:03:49 2012 +0000
summary:
Merged logging flush/close changes from 3.2.
files:
Lib/logging/__init__.py | 22 +++++++++-------
Lib/logging/handlers.py | 38 ++++++++++++++++------------
2 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/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,8 +914,9 @@
"""
Flushes the stream.
"""
- if self.stream and hasattr(self.stream, "flush"):
- self.stream.flush()
+ with self.lock:
+ if self.stream and hasattr(self.stream, "flush"):
+ self.stream.flush()
def emit(self, record):
"""
@@ -964,12 +965,13 @@
"""
Closes the stream.
"""
- if self.stream:
- self.flush()
- if hasattr(self.stream, "close"):
- self.stream.close()
- StreamHandler.close(self)
- self.stream = None
+ with self.lock:
+ if self.stream:
+ self.flush()
+ if hasattr(self.stream, "close"):
+ self.stream.close()
+ StreamHandler.close(self)
+ self.stream = None
def _open(self):
"""
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1,4 +1,4 @@
-# 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,10 +593,11 @@
"""
Closes the socket.
"""
- if self.sock:
- self.sock.close()
- self.sock = None
- logging.Handler.close(self)
+ with self.lock:
+ if self.sock:
+ self.sock.close()
+ self.sock = None
+ logging.Handler.close(self)
class DatagramHandler(SocketHandler):
"""
@@ -792,8 +792,9 @@
"""
Closes the socket.
"""
- self.socket.close()
- logging.Handler.close(self)
+ with self.lock:
+ self.socket.close()
+ logging.Handler.close(self)
def mapPriority(self, levelName):
"""
@@ -1137,7 +1138,8 @@
This version just zaps the buffer to empty.
"""
- self.buffer = []
+ with self.lock:
+ self.buffer = []
def close(self):
"""
@@ -1187,18 +1189,20 @@
The record buffer is also cleared by this operation.
"""
- if self.target:
- for record in self.buffer:
- self.target.handle(record)
- self.buffer = []
+ with self.lock:
+ if self.target:
+ for record in self.buffer:
+ self.target.handle(record)
+ self.buffer = []
def close(self):
"""
Flush, set the target to None and lose the buffer.
"""
self.flush()
- self.target = None
- BufferingHandler.close(self)
+ with self.lock:
+ self.target = None
+ BufferingHandler.close(self)
class QueueHandler(logging.Handler):
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list