traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

logging: Added locking in flush() and close() handler methods. Thanks to Fayaz Yusuf Khan for the suggestion.

This commit is contained in:
Vinay Sajip 2012-02-23 19:37:18 +00:00
parent 62cc44db0c
commit d23845e270
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/logging/__init__.py
View File

@ -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,
@ -828,8 +828,9 @@ class StreamHandler(Handler):
"""
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):
"""
@ -900,12 +901,13 @@ class FileHandler(StreamHandler):
"""
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):
"""

31
Lib/logging/handlers.py
View File

@ -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,
@ -563,9 +563,10 @@ class SocketHandler(logging.Handler):
"""
Closes the socket.
"""
if self.sock:
self.sock.close()
self.sock = None
with self.lock:
if self.sock:
self.sock.close()
self.sock = None
logging.Handler.close(self)
class DatagramHandler(SocketHandler):
@ -767,8 +768,9 @@ class SysLogHandler(logging.Handler):
"""
Closes the socket.
"""
if self.unixsocket:
self.socket.close()
with self.lock:
if self.unixsocket:
self.socket.close()
logging.Handler.close(self)
def mapPriority(self, levelName):
@ -1096,7 +1098,8 @@ class BufferingHandler(logging.Handler):
This version just zaps the buffer to empty.
"""
self.buffer = []
with self.lock:
self.buffer = []
def close(self):
"""
@ -1144,15 +1147,17 @@ class MemoryHandler(BufferingHandler):
records to the target, if there is one. Override if you want
different behaviour.
"""
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)