Title: [121505] trunk/Tools
- Revision
- 121505
- Author
- [email protected]
- Date
- 2012-06-28 18:59:40 -0700 (Thu, 28 Jun 2012)
Log Message
nrwt: clean up passing of log messages between processes
https://bugs.webkit.org/show_bug.cgi?id=90123
Reviewed by Ojan Vafai.
It turns out log messages are perfectly picklable by themselves
and contain the process id of the process that generated the
message, so if we just pass the record from the worker to the
manager and call logger.handle() in the manager, everything just
works :).
The change is covered by existing tests.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._log_messages):
* Scripts/webkitpy/layout_tests/controllers/worker.py:
(_WorkerLogHandler.emit):
* Scripts/webkitpy/layout_tests/views/metered_stream.py:
(MeteredStream.__init__):
(_LogHandler.emit):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121504 => 121505)
--- trunk/Tools/ChangeLog 2012-06-29 01:56:41 UTC (rev 121504)
+++ trunk/Tools/ChangeLog 2012-06-29 01:59:40 UTC (rev 121505)
@@ -1,5 +1,28 @@
2012-06-28 Dirk Pranke <[email protected]>
+ nrwt: clean up passing of log messages between processes
+ https://bugs.webkit.org/show_bug.cgi?id=90123
+
+ Reviewed by Ojan Vafai.
+
+ It turns out log messages are perfectly picklable by themselves
+ and contain the process id of the process that generated the
+ message, so if we just pass the record from the worker to the
+ manager and call logger.handle() in the manager, everything just
+ works :).
+
+ The change is covered by existing tests.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager._log_messages):
+ * Scripts/webkitpy/layout_tests/controllers/worker.py:
+ (_WorkerLogHandler.emit):
+ * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+ (MeteredStream.__init__):
+ (_LogHandler.emit):
+
+2012-06-28 Dirk Pranke <[email protected]>
+
add a pylint wrapper for linting python code
https://bugs.webkit.org/show_bug.cgi?id=90232
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (121504 => 121505)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-06-29 01:56:41 UTC (rev 121504)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-06-29 01:59:40 UTC (rev 121505)
@@ -1515,7 +1515,7 @@
def _log_messages(self, messages):
for message in messages:
- self._printer.writeln(*message)
+ logging.root.handle(message)
def _log_worker_stack(self, stack):
webkitpydir = self._port.path_from_webkit_base('Tools', 'Scripts', 'webkitpy') + self._filesystem.sep
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py (121504 => 121505)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py 2012-06-29 01:56:41 UTC (rev 121504)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py 2012-06-29 01:59:40 UTC (rev 121505)
@@ -305,4 +305,4 @@
self._pid = os.getpid()
def emit(self, record):
- self._worker._log_messages.append(tuple([record.getMessage(), record.created, self._pid]))
+ self._worker._log_messages.append(record)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py (121504 => 121505)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py 2012-06-29 01:56:41 UTC (rev 121504)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py 2012-06-29 01:59:40 UTC (rev 121505)
@@ -58,7 +58,6 @@
self._verbose = verbose
self._time_fn = time_fn or time.time
self._pid = pid or os.getpid()
-
self._isatty = self._stream.isatty()
self._erasing = self._isatty and not verbose
self._last_partial_line = ''
@@ -128,4 +127,4 @@
self.name = LOG_HANDLER_NAME
def emit(self, record):
- self._meter.writeln(record.getMessage(), record.created)
+ self._meter.writeln(record.getMessage(), record.created, record.process)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
