languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-06 17:55:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[3.12] gh-119819: Update logging configuration to support joinable multiproc… (GH-120090) (GH-120092)

Browse source 
(cherry picked from commit 983efcf15b)
This commit is contained in:
Miss Islington (bot) 2024-06-05 08:59:15 +02:00 committed by GitHub
parent c46621bf33
commit 8d199774cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Lib/logging/config.py
View file

@ -790,8 +790,10 @@ def configure_handler(self, config):
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):

8
Lib/test/test_logging.py
View file

@ -3896,12 +3896,16 @@ def test_config_queue_handler(self):
def test_multiprocessing_queues(self):
# See gh-119819
import_helper.import_module('_multiprocessing') # will skip test if it's not available
# will skip test if it's not available
import_helper.import_module('_multiprocessing')
cd = copy.deepcopy(self.config_queue_handler)
from multiprocessing import Queue as MQ, Manager as MM
q1 = MQ() # this can't be pickled
q2 = MM().Queue() # a proxy queue for use when pickling is needed
for qspec in (q1, q2):
q3 = MM().JoinableQueue() # a joinable proxy queue
for qspec in (q1, q2, q3):
fn = make_temp_file('.log', 'test_logging-cmpqh-')
cd['handlers']['h1']['filename'] = fn
cd['handlers']['ah']['queue'] = qspec