diff options
Diffstat (limited to 'Lib/logging/handlers.py')
| -rw-r--r-- | Lib/logging/handlers.py | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index f8c7164bc1..fe5f9bf7a1 100644 --- 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! """ @@ -563,9 +562,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 +767,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 +1097,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 +1146,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) |