Mercurial > cpython-lru_cache-weakref
diff Lib/logging/__init__.py @ 75211:b2adcd90e656 3.2
logging: Added locking in flush() and close() handler methods. Thanks to Fayaz Yusuf Khan for the suggestion.
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> |
|---|---|
| date | Thu, 23 Feb 2012 19:45:52 +0000 |
| parents | 6b951f27f6a8 |
| children | 344b4737d2fe cb9a2dff6240 |
line wrap: on
line diff
--- a/Lib/logging/__init__.py Thu Feb 23 10:54:28 2012 -0500 +++ b/Lib/logging/__init__.py Thu Feb 23 19:45:52 2012 +0000 @@ -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,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! """ @@ -917,8 +917,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): """ @@ -969,12 +970,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): """