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

2010-09-25 17:48:25 +00:00 · 2010-09-25 17:48:25 +00:00 · 9fdd11b3b6
parent 32fb6a81f9
commit 9fdd11b3b6
2 changed files with 8 additions and 4 deletions
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@ -917,8 +917,10 @@ def stopListening():
    Stop the listening server which was created with a call to listen().
    """
    global _listener
-    if _listener:
-        logging._acquireLock()
-        _listener.abort = 1
-        _listener = None
+    logging._acquireLock()
+    try:
+        if _listener:
+            _listener.abort = 1
+            _listener = None
+    finally:
        logging._releaseLock()
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -68,6 +68,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.