<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204275] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204275">204275</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2016-08-08 18:17:52 -0700 (Mon, 08 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some EWS console logs doesn't go to log file
https://bugs.webkit.org/show_bug.cgi?id=160585
rdar://problem/24464570
Reviewed by Daniel Bates.
* Scripts/webkitpy/common/system/logutils.py:
(FileSystemHandler._open): Ensure that we open logfile in append mode in order to avoid
any possible overwriting.
* Scripts/webkitpy/common/system/filesystem.py:
(FileSystem.open_text_file_for_writing): Add should_append parameter to append to file.
* Scripts/webkitpy/common/system/filesystem_mock.py:
(MockFileSystem.open_text_file_for_writing): Same.
* Scripts/webkitpy/common/system/filesystem_unittest.py:
(RealFileSystemTest.test_read_and_write_text_file): Removed unused variable 'hex_equivalent'.
(RealFileSystemTest.test_append_to_text_file): Added new unit test for testing append functionality.
* Scripts/webkitpy/tool/commands/queues.py:
(AbstractQueue.begin_work_queue): Configure the logger for overall webkitpy to log to file.
This will ensure that all the sub-modules inside webkitpy will log to file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystempy">trunk/Tools/Scripts/webkitpy/common/system/filesystem.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystem_mockpy">trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystem_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemlogutilspy">trunk/Tools/Scripts/webkitpy/common/system/logutils.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsqueuespy">trunk/Tools/Scripts/webkitpy/tool/commands/queues.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204274 => 204275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-09 01:06:50 UTC (rev 204274)
+++ trunk/Tools/ChangeLog 2016-08-09 01:17:52 UTC (rev 204275)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-08 Aakash Jain <aakash_jain@apple.com>
+
+ Some EWS console logs doesn't go to log file
+ https://bugs.webkit.org/show_bug.cgi?id=160585
+ rdar://problem/24464570
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/common/system/logutils.py:
+ (FileSystemHandler._open): Ensure that we open logfile in append mode in order to avoid
+ any possible overwriting.
+ * Scripts/webkitpy/common/system/filesystem.py:
+ (FileSystem.open_text_file_for_writing): Add should_append parameter to append to file.
+ * Scripts/webkitpy/common/system/filesystem_mock.py:
+ (MockFileSystem.open_text_file_for_writing): Same.
+ * Scripts/webkitpy/common/system/filesystem_unittest.py:
+ (RealFileSystemTest.test_read_and_write_text_file): Removed unused variable 'hex_equivalent'.
+ (RealFileSystemTest.test_append_to_text_file): Added new unit test for testing append functionality.
+ * Scripts/webkitpy/tool/commands/queues.py:
+ (AbstractQueue.begin_work_queue): Configure the logger for overall webkitpy to log to file.
+ This will ensure that all the sub-modules inside webkitpy will log to file.
+
</ins><span class="cx"> 2016-08-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Have the iOS platform interit from the Apple platform in webkitpy
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (204274 => 204275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2016-08-09 01:06:50 UTC (rev 204274)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2016-08-09 01:17:52 UTC (rev 204275)
</span><span class="lines">@@ -235,7 +235,9 @@
</span><span class="cx"> # not being seekable. See http://stackoverflow.com/questions/1510188/can-seek-and-tell-work-with-utf-8-encoded-documents-in-python .
</span><span class="cx"> return codecs.open(path, 'r', 'utf8', errors)
</span><span class="cx">
</span><del>- def open_text_file_for_writing(self, path):
</del><ins>+ def open_text_file_for_writing(self, path, should_append=False):
+ if should_append:
+ return codecs.open(path, 'a', 'utf8')
</ins><span class="cx"> return codecs.open(path, 'w', 'utf8')
</span><span class="cx">
</span><span class="cx"> def open_stdin(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystem_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py (204274 => 204275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py 2016-08-09 01:06:50 UTC (rev 204274)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py 2016-08-09 01:17:52 UTC (rev 204275)
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> self._raise_not_found(path)
</span><span class="cx"> return ReadableTextFileObject(self, path, self.files[path])
</span><span class="cx">
</span><del>- def open_text_file_for_writing(self, path):
</del><ins>+ def open_text_file_for_writing(self, path, should_append=False):
</ins><span class="cx"> return WritableTextFileObject(self, path)
</span><span class="cx">
</span><span class="cx"> def read_text_file(self, path):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystem_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py (204274 => 204275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py 2016-08-09 01:06:50 UTC (rev 204274)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py 2016-08-09 01:17:52 UTC (rev 204275)
</span><span class="lines">@@ -187,7 +187,6 @@
</span><span class="cx"> text_path = None
</span><span class="cx">
</span><span class="cx"> unicode_text_string = u'\u016An\u012Dc\u014Dde\u033D'
</span><del>- hex_equivalent = '\xC5\xAA\x6E\xC4\xAD\x63\xC5\x8D\x64\x65\xCC\xBD'
</del><span class="cx"> try:
</span><span class="cx"> text_path = tempfile.mktemp(prefix='tree_unittest_')
</span><span class="cx"> file = fs.open_text_file_for_writing(text_path)
</span><span class="lines">@@ -203,6 +202,31 @@
</span><span class="cx"> if text_path and fs.isfile(text_path):
</span><span class="cx"> os.remove(text_path)
</span><span class="cx">
</span><ins>+ def test_append_to_text_file(self):
+ fs = FileSystem()
+ text_path = None
+
+ unicode_text_string1 = u'\u016An\u012Dc\u014Dde\u033D'
+ unicode_text_string2 = 'Hello'
+ try:
+ text_path = tempfile.mktemp(prefix='tree_unittest_')
+ file = fs.open_text_file_for_writing(text_path)
+ file.write(unicode_text_string1)
+ file.close()
+
+ file = fs.open_text_file_for_writing(text_path, should_append=True)
+ file.write(unicode_text_string2)
+ file.close()
+
+ file = fs.open_text_file_for_reading(text_path)
+ read_text = file.read()
+ file.close()
+
+ self.assertEqual(read_text, unicode_text_string1 + unicode_text_string2)
+ finally:
+ if text_path and fs.isfile(text_path):
+ os.remove(text_path)
+
</ins><span class="cx"> def test_read_and_write_file(self):
</span><span class="cx"> fs = FileSystem()
</span><span class="cx"> text_path = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemlogutilspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/logutils.py (204274 => 204275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/logutils.py 2016-08-09 01:06:50 UTC (rev 204274)
+++ trunk/Tools/Scripts/webkitpy/common/system/logutils.py 2016-08-09 01:17:52 UTC (rev 204275)
</span><span class="lines">@@ -232,4 +232,4 @@
</span><span class="cx"> FileHandler.__init__(self, filename)
</span><span class="cx">
</span><span class="cx"> def _open(self):
</span><del>- return self.filesystem.open_text_file_for_writing(self.filename)
</del><ins>+ return self.filesystem.open_text_file_for_writing(self.filename, should_append=True)
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueuespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (204274 => 204275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2016-08-09 01:06:50 UTC (rev 204274)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2016-08-09 01:17:52 UTC (rev 204275)
</span><span class="lines">@@ -123,7 +123,9 @@
</span><span class="cx"> raise NotImplementedError, "subclasses must implement"
</span><span class="cx">
</span><span class="cx"> def begin_work_queue(self):
</span><del>- logutils.configure_logger_to_log_to_file(_log, self.queue_log_path(), self.host.filesystem)
</del><ins>+ # FIXME: We should stop the logging as well when the queue stops.
+ # We are using logging.getLogger("webkitpy") instead of _log since we want to capture all messages logged from webkitpy modules.
+ logutils.configure_logger_to_log_to_file(logging.getLogger("webkitpy"), self.queue_log_path(), self.host.filesystem)
</ins><span class="cx"> _log.info("CAUTION: %s will discard all local changes in \"%s\"" % (self.name, self._tool.scm().checkout_root))
</span><span class="cx"> if self._options.confirm:
</span><span class="cx"> response = self._tool.user.prompt("Are you sure? Type \"yes\" to continue: ")
</span></span></pre>
</div>
</div>
</body>
</html>