diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-01-07 17:03:23 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2020-01-07 17:03:23 (GMT) |
| commit | bff48c6734f936257b0cfae58dbea67d43e3b245 (patch) | |
| tree | 1571b1e1836aa11ffa837cab957155f926b76951 | |
| parent | 4112a3da2e01ecc19e9f54b8ac7b383b6f5e85c8 (diff) | |
| download | cpython-bff48c6734f936257b0cfae58dbea67d43e3b245.zip cpython-bff48c6734f936257b0cfae58dbea67d43e3b245.tar.gz cpython-bff48c6734f936257b0cfae58dbea67d43e3b245.tar.bz2 | |
bpo-39198: Ensure logging global lock is released on exception in isEnabledFor (GH-17689) (GH-17897)
(cherry picked from commit 950c6795aa0ffa85e103a13e7a04e08cb34c66ad)
| -rw-r--r-- | Lib/logging/__init__.py | 15 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-01-02-20-21-03.bpo-39198.nzwGyG.rst | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 16812ec..0cfaec8 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1685,12 +1685,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 |