Attachment 427573 Details for Bug 225311 – Patch

[patch] Patch

bug-225311-20210503104937.patch (text/plain), 3.37 KB, created by Jonathan Bedard on 2021-05-03 10:49:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2021-05-03 10:49:38 PDT

Size: 3.37 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 276908)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2021-05-03  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [webkitcorepy] Pass logging level to child processes
>+        https://bugs.webkit.org/show_bug.cgi?id=225311
>+        <rdar://problem/77457646>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/libraries/webkitcorepy/setup.py: Bump version.
>+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
>+        * Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py:
>+        (Process.main): Set root logging level.
>+        (TaskPool.__init__): Pass logging level to child process.
>+
> 2021-05-03  Chris Dumez  <cdumez@apple.com>
> 
>         Restore pre-r276879 behavior for FileSystem::deleteFile() and FileSystem::deleteEmptyDirectory()
>Index: Tools/Scripts/libraries/webkitcorepy/setup.py
>===================================================================
>--- Tools/Scripts/libraries/webkitcorepy/setup.py	(revision 276908)
>+++ Tools/Scripts/libraries/webkitcorepy/setup.py	(working copy)
>@@ -30,7 +30,7 @@ def readme():
> 
> setup(
>     name='webkitcorepy',
>-    version='0.5.11',
>+    version='0.5.12',
>     description='Library containing various Python support classes and functions.',
>     long_description=readme(),
>     classifiers=[
>Index: Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>===================================================================
>--- Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	(revision 276908)
>+++ Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	(working copy)
>@@ -37,7 +37,7 @@ from webkitcorepy.output_capture import 
> from webkitcorepy.task_pool import TaskPool
> from webkitcorepy.credentials import credentials
> 
>-version = Version(0, 5, 11)
>+version = Version(0, 5, 12)
> 
> from webkitcorepy.autoinstall import Package, AutoInstall
> if sys.version_info > (3, 0):
>Index: Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py
>===================================================================
>--- Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py	(revision 276908)
>+++ Tools/Scripts/libraries/webkitcorepy/webkitcorepy/task_pool.py	(working copy)
>@@ -231,7 +231,7 @@ class Process(object):
>             cls.working = False
> 
>     @classmethod
>-    def main(cls, name, setup, setupargs, setupkwargs, queue, teardown, teardownargs, teardownkwargs):
>+    def main(cls, name, loglevel, setup, setupargs, setupkwargs, queue, teardown, teardownargs, teardownkwargs):
>         from tblib import pickling_support
> 
>         cls.name = name
>@@ -250,6 +250,7 @@ class Process(object):
>         for handler in logger.handlers:
>             logger.removeHandler(handler)
>         logger.addHandler(cls.LogHandler(queue))
>+        logger.setLevel(loglevel)
> 
>         queue.send(State(State.STARTING))
> 
>@@ -304,7 +305,7 @@ class TaskPool(object):
>         self.workers = [multiprocessing.Process(
>             target=Process.main,
>             args=(
>-                '{}/{}'.format(name, count),
>+                '{}/{}'.format(name, count), logging.getLogger().getEffectiveLevel(),
>                 setup, setupargs, setupkwargs,
>                 BiDirectionalQueue(outgoing=self.queue.incoming, incoming=self.queue.outgoing),
>                 teardown, teardownargs, teardownkwargs,

Actions: View | Formatted Diff | Diff

Attachments on bug 225311: 427568 | 427573 | 427575