<!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>[162358] 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/162358">162358</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 10:37:49 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>EWS should provide better information to Dashboard via JSON
https://bugs.webkit.org/show_bug.cgi?id=127265
Reviewed by Ryosuke Niwa.
* QueueStatusServer/app.yaml: Updated version.
* QueueStatusServer/main.py:
* QueueStatusServer/handlers/queuelengthjson.py:
Added a way to cheaply get only the queue length, which is all the dashboard
needs unless a popover is opened.
* QueueStatusServer/handlers/queuestatusjson.py: Updated to return more information
that we will need. Changed some field names to be more meaningful. Fixed bot listing
to understand that a bot can be reprurposed and used in a different queue.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsQueueStatusServerappyaml">trunk/Tools/QueueStatusServer/app.yaml</a></li>
<li><a href="#trunkToolsQueueStatusServerhandlersqueuestatusjsonpy">trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py</a></li>
<li><a href="#trunkToolsQueueStatusServermainpy">trunk/Tools/QueueStatusServer/main.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsQueueStatusServerhandlersqueuelengthjsonpy">trunk/Tools/QueueStatusServer/handlers/queuelengthjson.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162357 => 162358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-20 18:24:34 UTC (rev 162357)
+++ trunk/Tools/ChangeLog 2014-01-20 18:37:49 UTC (rev 162358)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-01-20 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ EWS should provide better information to Dashboard via JSON
+ https://bugs.webkit.org/show_bug.cgi?id=127265
+
+ Reviewed by Ryosuke Niwa.
+
+ * QueueStatusServer/app.yaml: Updated version.
+
+ * QueueStatusServer/main.py:
+ * QueueStatusServer/handlers/queuelengthjson.py:
+ Added a way to cheaply get only the queue length, which is all the dashboard
+ needs unless a popover is opened.
+
+ * QueueStatusServer/handlers/queuestatusjson.py: Updated to return more information
+ that we will need. Changed some field names to be more meaningful. Fixed bot listing
+ to understand that a bot can be reprurposed and used in a different queue.
+
+2014-01-20 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> Make uploading results to EWS work despite robots.txt
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127296
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerappyaml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/app.yaml (162357 => 162358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/app.yaml 2014-01-20 18:24:34 UTC (rev 162357)
+++ trunk/Tools/QueueStatusServer/app.yaml 2014-01-20 18:37:49 UTC (rev 162358)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> application: webkit-queues
</span><del>-version: 162287 # Bugzilla bug ID of last major change
</del><ins>+version: 162358 # Bugzilla bug ID of last major change
</ins><span class="cx"> runtime: python
</span><span class="cx"> api_version: 1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerhandlersqueuelengthjsonpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/QueueStatusServer/handlers/queuelengthjson.py (0 => 162358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/handlers/queuelengthjson.py (rev 0)
+++ trunk/Tools/QueueStatusServer/handlers/queuelengthjson.py 2014-01-20 18:37:49 UTC (rev 162358)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from google.appengine.ext import webapp
+
+from model.queues import Queue
+
+# Fall back to simplejson, because we are still on Python 2.5.
+try:
+ import json
+except ImportError:
+ import simplejson as json
+
+
+class QueueLengthJSON(webapp.RequestHandler):
+ def get(self, queue_name):
+ self.response.headers["Access-Control-Allow-Origin"] = "*"
+
+ queue_name = queue_name.lower()
+ queue = Queue.queue_with_name(queue_name)
+ if not queue:
+ self.error(404)
+ return
+
+ self.response.headers['Content-Type'] = 'application/json'
+
+ status = {
+ "queue_length": len(queue.work_items().item_ids)
+ }
+ self.response.out.write(json.dumps(status))
</ins><span class="cx">Property changes on: trunk/Tools/QueueStatusServer/handlers/queuelengthjson.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkToolsQueueStatusServerhandlersqueuestatusjsonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py (162357 => 162358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py 2014-01-20 18:24:34 UTC (rev 162357)
+++ trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py 2014-01-20 18:37:49 UTC (rev 162358)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2013 Apple. All rights reserved.
</del><ins>+# Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -45,30 +45,51 @@
</span><span class="cx">
</span><span class="cx"> rows = []
</span><span class="cx"> for item_id in queued_items.item_ids:
</span><del>- statuses = QueueStatus.all().filter('queue_name =', queue.name()).filter('active_patch_id =', item_id).order('-date').fetch(1)
- status = statuses[0].message if statuses else ""
</del><ins>+ patchStatusQuery = QueueStatus.all().filter('queue_name =', queue.name()).filter('active_patch_id =', item_id).order('-date')
+ statuses = patchStatusQuery.fetch(1)
+ message = None
+ message_time = None
+ bug_id = None
+ results_url = None
+ if statuses:
+ message = statuses[0].message
+ message_time = statuses[0].date
+ bug_id = statuses[0].active_bug_id
+ results_url = self.request.host_url + "/results/" + str(statuses[0].key().id()) if statuses[0].results_file else None
+
</ins><span class="cx"> rows.append({
</span><span class="cx"> "attachment_id": item_id,
</span><ins>+ "bug_id": bug_id,
</ins><span class="cx"> "active": active_items and active_items.time_for_item(item_id) != None,
</span><del>- "status": status,
</del><ins>+ "active_since": active_items and active_items.time_for_item(item_id),
+ "latest_message": message,
+ "latest_message_time": message_time,
+ "message_count": patchStatusQuery.count(),
</ins><span class="cx"> "status_page": self.request.host_url + "/patch/" + str(item_id),
</span><ins>+ "latest_results": results_url,
</ins><span class="cx"> })
</span><span class="cx"> return rows
</span><span class="cx">
</span><span class="cx"> def _bots(self, queue):
</span><ins>+ # First, collect all bots that ever served this queue.
</ins><span class="cx"> bot_id_statuses = QueueStatus.all(projection=['bot_id'], distinct=True).filter('queue_name =', queue.name()).fetch(500)
</span><span class="cx"> bot_ids = list(entry.bot_id for entry in bot_id_statuses)
</span><span class="cx"> result = []
</span><span class="cx"> for bot_id in bot_ids:
</span><span class="cx"> status = QueueStatus.all().filter('bot_id =', bot_id).order('-date').get()
</span><ins>+
+ if status.queue_name != queue.name():
+ # The bot got re-purposed, and is serving a different queue now.
+ continue
+
</ins><span class="cx"> result.append({
</span><span class="cx"> "bot_id": bot_id,
</span><span class="cx"> "status_page": self.request.host_url + "/queue-status/" + queue.name() + "/bots/" + bot_id,
</span><span class="cx"> "latest_message": status.message,
</span><span class="cx"> "latest_message_time": status.date,
</span><ins>+ "latest_message_bug_id": status.active_bug_id,
+ "latest_message_patch_id": status.active_patch_id,
</ins><span class="cx"> "latest_output": self.request.host_url + "/results/" + str(status.key().id()) if status.results_file else None,
</span><del>- "active_bug_id": status.active_bug_id,
- "active_patch_id": status.active_patch_id,
</del><span class="cx"> })
</span><span class="cx"> return result
</span><span class="cx">
</span><span class="lines">@@ -85,6 +106,7 @@
</span><span class="cx">
</span><span class="cx"> status = {
</span><span class="cx"> "status_page": self.request.host_url + "/queue-status/" + queue_name,
</span><ins>+ "charts_page": self.request.host_url + "/queue-charts/" + queue_name,
</ins><span class="cx"> "queue": self._rows_for_work_items(queue),
</span><span class="cx"> "bots": self._bots(queue),
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsQueueStatusServermainpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/main.py (162357 => 162358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/main.py 2014-01-20 18:24:34 UTC (rev 162357)
+++ trunk/Tools/QueueStatusServer/main.py 2014-01-20 18:37:49 UTC (rev 162358)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> from handlers.patch import Patch
</span><span class="cx"> from handlers.patchstatus import PatchStatus
</span><span class="cx"> from handlers.queuecharts import QueueCharts
</span><ins>+from handlers.queuelengthjson import QueueLengthJSON
</ins><span class="cx"> from handlers.queuestatus import QueueStatus
</span><span class="cx"> from handlers.queuestatusjson import QueueStatusJSON
</span><span class="cx"> from handlers.recentstatus import QueuesOverview
</span><span class="lines">@@ -68,6 +69,7 @@
</span><span class="cx"> (r'/status-bubble/(.*)', StatusBubble),
</span><span class="cx"> (r'/svn-revision/(.*)', SVNRevision),
</span><span class="cx"> (r'/queue-charts/(.*)', QueueCharts),
</span><ins>+ (r'/queue-length-json/(.*)', QueueLengthJSON),
</ins><span class="cx"> (r'/queue-status/(.*)/bots/(.*)', QueueStatus),
</span><span class="cx"> (r'/queue-status/(.*)', QueueStatus),
</span><span class="cx"> (r'/queue-status-json/(.*)', QueueStatusJSON),
</span></span></pre>
</div>
</div>
</body>
</html>