From 950c6795aa0ffa85e103a13e7a04e08cb34c66ad Mon Sep 17 00:00:00 2001 From: Derek Brown Date: Tue, 7 Jan 2020 08:40:23 -0800 Subject: bpo-39198: Ensure logging global lock is released on exception in isEnabledFor (GH-17689) --- Lib/logging/__init__.py | 15 +++++++++------ .../next/Library/2020-01-02-20-21-03.bpo-39198.nzwGyG.rst | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2020-01-02-20-21-03.bpo-39198.nzwGyG.rst diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 62a87a7..59d5fa5 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1687,12 +1687,15 @@ class Logger(Filterer): return self._cache[level] except KeyError: _acquireLock() - if self.manager.disable >= level: - is_enabled = self._cache[level] = False - else: - is_enabled = self._cache[level] = level >= self.getEffectiveLevel() - _releaseLock() - + try: + if self.manager.disable >= level: + is_enabled = self._cache[level] = False + else: + is_enabled = self._cache[level] = ( + level >= self.getEffectiveLevel() + ) + finally: + _releaseLock() return is_enabled def getChild(self, suffix): diff --git a/Misc/NEWS.d/next/Library/2020-01-02-20-21-03.bpo-39198.nzwGyG.rst b/Misc/NEWS.d/next/Library/2020-01-02-20-21-03.bpo-39198.nzwGyG.rst new file mode 100644 index 0000000..ec4e81e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-02-20-21-03.bpo-39198.nzwGyG.rst @@ -0,0 +1 @@ +If an exception were to be thrown in `Logger.isEnabledFor` (say, by asyncio timeouts or stopit) , the `logging` global lock may not be released appropriately, resulting in deadlock. This change wraps that block of code with `try...finally` to ensure the lock is released. \ No newline at end of file -- cgit v0.12