From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 30 Jan 2024 12:34:18 +0000 (+0000)
Subject: gh-114706: Allow QueueListener.stop() to be called more than once. (GH-114748)
X-Git-Tag: v3.13.0a4~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e21754d7f8336d4647e28f355d8a3dbd5a2c7545;p=thirdparty%2FPython%2Fcpython.git

gh-114706: Allow QueueListener.stop() to be called more than once. (GH-114748)
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 9840b7b0aeba..e7f1322e4ba3 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1586,6 +1586,7 @@ class QueueListener(object):
         Note that if you don't call this before your application exits, there
         may be some records still left on the queue, which won't be processed.
         """
-        self.enqueue_sentinel()
-        self._thread.join()
-        self._thread = None
+        if self._thread:  # see gh-114706 - allow calling this more than once
+            self.enqueue_sentinel()
+            self._thread.join()
+            self._thread = None
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 908e242b85f5..888523227c2a 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -4089,6 +4089,7 @@ class QueueHandlerTest(BaseTest):
             self.que_logger.critical(self.next_message())
         finally:
             listener.stop()
+            listener.stop()  # gh-114706 - ensure no crash if called again
         self.assertTrue(handler.matches(levelno=logging.WARNING, message='1'))
         self.assertTrue(handler.matches(levelno=logging.ERROR, message='2'))
         self.assertTrue(handler.matches(levelno=logging.CRITICAL, message='3'))