Changeset 122517 in webkit

Timestamp:

Jul 12, 2012 3:35:40 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

webkitpy: clean up logging handlers, lint common.message_pool
​https://bugs.webkit.org/show_bug.cgi?id=91152

Reviewed by Ojan Vafai.

The unix implementation of multiprocessing clones any logging
handlers from the parent process into the child; we currently
don't want this behavior in our code, so I was hand-removing the
installed handlers in the child process I knew about. After thinking
about it further, I think it was simpler and safe enough to just
remove all handlers in the child, since the message pool
propagates any message from the child back into the parent.

We can always change this in the future if it turns out to be an issue.

I'm also fixing a couple of other lint warnings while I'm at it.

• Scripts/webkitpy/common/message_pool.py:

(_MessagePool.exit):
(_MessagePool._handle_worker_exception):
(_Worker._set_up_logging):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/message_pool.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-12  Dirk Pranke  <dpranke@chromium.org>
+
+        webkitpy: clean up logging handlers, lint common.message_pool
+        https://bugs.webkit.org/show_bug.cgi?id=91152
+
+        Reviewed by Ojan Vafai.
+
+        The unix implementation of multiprocessing clones any logging
+        handlers from the parent process into the child; we currently
+        don't want this behavior in our code, so I was hand-removing the
+        installed handlers in the child process I knew about. After thinking
+        about it further, I think it was simpler and safe enough to just
+        remove all handlers in the child, since the message pool
+        propagates any message from the child back into the parent.
+        
+        We can always change this in the future if it turns out to be an issue.
+
+        I'm also fixing a couple of other lint warnings while I'm at it.
+
+        * Scripts/webkitpy/common/message_pool.py:
+        (_MessagePool.__exit__):
+        (_MessagePool._handle_worker_exception):
+        (_Worker._set_up_logging):
+
 2012-07-12  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/message_pool.py

@@ -83 +83 @@
         return self
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def __exit__(self, exc_type, exc_value, exc_traceback):
         self._close()
         return False
@@ -144 +144 @@
 
     @staticmethod
-    def _handle_worker_exception(source, exception_type, exception_value, stack):
+    def _handle_worker_exception(source, exception_type, exception_value, _):
         if exception_type == KeyboardInterrupt:
             raise exception_type(exception_value)
@@ -289 +289 @@
         self._logger = logging.getLogger()
 
-        # The unix multiprocessing implementation clones the MeteredStream log handler
-        # into the child process, so we need to remove it to avoid duplicate logging.
+        # The unix multiprocessing implementation clones any log handlers into the child process,
+        # so we remove them to avoid duplicate logging.
         for h in self._logger.handlers:
-            # log handlers don't have names until python 2.7.
-            # FIXME: log handler names should be passed in.
-            if getattr(h, 'name', '') in ('MeteredStreamLogHandler', 'webkitpy.test.printer'):
-                self._logger.removeHandler(h)
-                break
+            self._logger.removeHandler(h)
 
         self._log_handler = _WorkerLogHandler(self)