mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 16:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #7403: logging: Fixed possible race condition in lock creation.

Browse source
This commit is contained in:
Vinay Sajip 2009-11-27 15:34:35 +00:00
parent 4c9c260c1a
commit b9c85c156b
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/logging/__init__.py
View file

@ -176,7 +176,10 @@ def addLevelName(level, levelName):
#the lock would already have been acquired - so we need an RLock. #the lock would already have been acquired - so we need an RLock.
#The same argument applies to Loggers and Manager.loggerDict. #The same argument applies to Loggers and Manager.loggerDict.
# #
_lock = None if thread:
_lock = threading.RLock()
else:
_lock = None
def _acquireLock(): def _acquireLock():
""" """
@ -184,9 +187,6 @@ def _acquireLock():
This should be released with _releaseLock(). This should be released with _releaseLock().
""" """
global _lock
if (not _lock) and thread:
_lock = threading.RLock()
if _lock: if _lock:
_lock.acquire() _lock.acquire()

2
Misc/NEWS
View file

@ -18,6 +18,8 @@ Core and builtins
Library Library
------- -------
- Issue #7403: logging: Fixed possible race condition in lock creation.
- Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop - Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop
forever on incomplete input. That caused tarfile.open() to hang when used 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 with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or