summaryrefslogtreecommitdiffstats
path: root/Lib/logging/config.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2024-06-05 06:59:41 (GMT)
committerGitHub <noreply@github.com>2024-06-05 06:59:41 (GMT)
commit71f86eedeb29d1933edbc9b27f40ce5cbba2f4a9 (patch)
treec9cb9c5cf1f8c6ca1e4911d08603204902d97676 /Lib/logging/config.py
parentdf8a98abee44d22192d1900d8f62c12399e080ae (diff)
downloadcpython-71f86eedeb29d1933edbc9b27f40ce5cbba2f4a9.zip
cpython-71f86eedeb29d1933edbc9b27f40ce5cbba2f4a9.tar.gz
cpython-71f86eedeb29d1933edbc9b27f40ce5cbba2f4a9.tar.bz2
[3.13] gh-119819: Update logging configuration to support joinable multiproc… (GH-120090) (GH-120093)
(cherry picked from commit 983efcf15b2503fe0c05d5e03762385967962b33)
Diffstat (limited to 'Lib/logging/config.py')
-rw-r--r--Lib/logging/config.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 0b10bf8..9de84e5 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -783,8 +783,10 @@ class DictConfigurator(BaseConfigurator):
from multiprocessing.queues import Queue as MPQueue
from multiprocessing import Manager as MM
proxy_queue = MM().Queue()
+ proxy_joinable_queue = MM().JoinableQueue()
qspec = config['queue']
- if not isinstance(qspec, (queue.Queue, MPQueue, type(proxy_queue))):
+ if not isinstance(qspec, (queue.Queue, MPQueue,
+ type(proxy_queue), type(proxy_joinable_queue))):
if isinstance(qspec, str):
q = self.resolve(qspec)
if not callable(q):