gh-106238: Handle KeyboardInterrupt during logging._acquireLock() (GH…

…-106239) Co-authored-by: Ariel Eizenberg <ariel.eizenberg@pagaya.com>
python · Jul 6, 2023 · 99b00ef · 99b00ef
1 parent 38aa89a
commit 99b00ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
@@ -238,7 +238,11 @@ def _acquireLock():
  This should be released with _releaseLock().
  """
  if _lock:
- _lock.acquire()
+ try:
+ _lock.acquire()
+ except BaseException:
+ _lock.release()
+ raise
 
 def _releaseLock():
  """

diff --git a/Misc/NEWS.d/next/Library/2023-06-29-12-40-52.gh-issue-106238.VulKb9.rst b/Misc/NEWS.d/next/Library/2023-06-29-12-40-52.gh-issue-106238.VulKb9.rst
@@ -0,0 +1 @@
+Fix rare concurrency bug in lock acquisition by the logging package.