<!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>[163196] 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/163196">163196</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-31 13:56:30 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit Bot Watcher's Dashboard: Teach JSON.load() to take optional failure callback function
https://bugs.webkit.org/show_bug.cgi?id=127924
Reviewed by Alexey Proskuryakov.
Towards providing better error handling when a JSON load fails with a non-200 HTTP status
code, we should teach JSON.load() to take an optional failure callback function and invoke
it when either a load error or a JSON parsing error occurs.
As a side benefit of having a failure callback function a caller can separate the error handling
logic for a JSON load or parse error from the logic of handling a successful parsing of JSON content.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(BuildbotIteration.prototype.loadLayoutTestResults): Move JSON parser error logic into failure
callback function.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js:
(JSON.load): Modified to take optional failure callback function called failureCallback.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsUtilitiesjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (163195 => 163196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-31 21:34:38 UTC (rev 163195)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-31 21:56:30 UTC (rev 163196)
</span><span class="lines">@@ -339,12 +339,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSON.load(this.queue.buildbot.layoutTestFullResultsURLForIteration(this), function(data) {
</span><del>- if (data.error) {
- console.log(data.error);
- callback();
- return;
- }
-
</del><span class="cx"> this.hasPrettyPatch = data.has_pretty_patch;
</span><span class="cx">
</span><span class="cx"> this.layoutTestResults.regressions = collectResults(data.tests, function(info) { return info["report"] === "REGRESSION" });
</span><span class="lines">@@ -357,6 +351,10 @@
</span><span class="cx"> console.assert(data.num_missing === this.layoutTestResults.testsWithMissingResults.length);
</span><span class="cx">
</span><span class="cx"> callback();
</span><del>- }.bind(this), {jsonpCallbackName: "ADD_RESULTS"});
</del><ins>+ }.bind(this),
+ function(data) {
+ console.log(data.error);
+ callback();
+ }, {jsonpCallbackName: "ADD_RESULTS"});
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js (163195 => 163196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js 2014-01-31 21:34:38 UTC (rev 163195)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js 2014-01-31 21:56:30 UTC (rev 163196)
</span><span class="lines">@@ -23,13 +23,19 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-JSON.load = function(url, callback, options)
</del><ins>+JSON.LoadError = "JSONLoadError";
+JSON.ParseError = "JSONParseError";
+
+JSON.load = function(url, successCallback, failureCallback, options)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(url);
</span><span class="cx">
</span><del>- if (!(callback instanceof Function))
</del><ins>+ if (!(successCallback instanceof Function))
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!(failureCallback instanceof Function))
+ failureCallback = function() { };
+
</ins><span class="cx"> if (typeof options !== "object")
</span><span class="cx"> options = {};
</span><span class="cx">
</span><span class="lines">@@ -38,18 +44,25 @@
</span><span class="cx"> if (this.readyState !== 4)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Don't consider a status of 0 to be a load error for easier testing with local files.
+ var loadErrorOccurred = this.status !== 0 && this.status !== 200;
+ if (loadErrorOccurred) {
+ failureCallback({errorType: JSON.LoadError, error: this.statusText, errorHTTPCode: this.status});
+ return;
+ }
+
</ins><span class="cx"> try {
</span><span class="cx"> var responseText = request.responseText;
</span><span class="cx"> if (options.hasOwnProperty("jsonpCallbackName"))
</span><span class="cx"> responseText = responseText.replace(new RegExp("^" + options.jsonpCallbackName + "\\((.*)\\);?$"), "$1");
</span><span class="cx"> var data = JSON.parse(responseText);
</span><span class="cx"> } catch (e) {
</span><del>- var data = {error: e.message};
</del><ins>+ var data = {errorType: JSON.ParseError, error: e.message};
+ failureCallback(data);
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Allow a status of 0 for easier testing with local files.
- if (!this.status || this.status === 200)
- callback(data);
</del><ins>+ successCallback(data);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> request.open("GET", url);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163195 => 163196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-31 21:34:38 UTC (rev 163195)
+++ trunk/Tools/ChangeLog 2014-01-31 21:56:30 UTC (rev 163196)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-31 Daniel Bates <dabates@apple.com>
+
+ WebKit Bot Watcher's Dashboard: Teach JSON.load() to take optional failure callback function
+ https://bugs.webkit.org/show_bug.cgi?id=127924
+
+ Reviewed by Alexey Proskuryakov.
+
+ Towards providing better error handling when a JSON load fails with a non-200 HTTP status
+ code, we should teach JSON.load() to take an optional failure callback function and invoke
+ it when either a load error or a JSON parsing error occurs.
+
+ As a side benefit of having a failure callback function a caller can separate the error handling
+ logic for a JSON load or parse error from the logic of handling a successful parsing of JSON content.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (BuildbotIteration.prototype.loadLayoutTestResults): Move JSON parser error logic into failure
+ callback function.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js:
+ (JSON.load): Modified to take optional failure callback function called failureCallback.
+
</ins><span class="cx"> 2014-01-29 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to implement JS builtins in JS
</span></span></pre>
</div>
</div>
</body>
</html>