mirror of
https://github.com/python/cpython.git
synced 2025-08-19 00:00:48 +00:00
Issue #7403: logging: Fixed possible race condition in lock creation.
This commit is contained in:
parent
4c9c260c1a
commit
b9c85c156b
2 changed files with 6 additions and 4 deletions
|
@ -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()
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue