Issue #9947: logging: Fixed locking bug in stopListening.

3eac591a · Vinay Sajip · 546885ea · 3eac591a · 3eac591a
Commit 3eac591a authored Sep 25, 2010 by Vinay Sajip
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

Lib/logging/config.py Lib/logging/config.py +6 -4

Misc/NEWS Misc/NEWS +2 -0

No files found.
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -895,8 +895,10 @@ def stopListening():
    Stop the listening server which was created with a call to listen().
    """
    global _listener
-    if _listener:
    logging._acquireLock()
+    try:
+        if _listener:
            _listener.abort = 1
            _listener = None
+    finally:
        logging._releaseLock()
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,8 @@ Core and Builtins
 Library
 -------
+- Issue #9947: logging: Fixed locking bug in stopListening.
 - Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler.
 - Issue #9936: Fixed executable lines' search in the trace module.