From b9c85c156b0b8faf4c090872bed22a868447b785 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Fri, 27 Nov 2009 15:34:35 +0000 Subject: [PATCH] Issue #7403: logging: Fixed possible race condition in lock creation. --- Lib/logging/__init__.py | 8 ++++---- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 39ffae77a8..7850a161a0 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -176,7 +176,10 @@ def addLevelName(level, levelName): #the lock would already have been acquired - so we need an RLock. #The same argument applies to Loggers and Manager.loggerDict. # -_lock = None +if thread: + _lock = threading.RLock() +else: + _lock = None def _acquireLock(): """ @@ -184,9 +187,6 @@ def _acquireLock(): This should be released with _releaseLock(). """ - global _lock - if (not _lock) and thread: - _lock = threading.RLock() if _lock: _lock.acquire() diff --git a/Misc/NEWS b/Misc/NEWS index fff00ddc7a..9659f1c394 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -18,6 +18,8 @@ Core and builtins Library ------- +- Issue #7403: logging: Fixed possible race condition in lock creation. + - Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop forever on incomplete input. That caused tarfile.open() to hang when used with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or -- 2.40.0