<!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>[161062] 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/161062">161062</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2013-12-25 01:13:47 -0800 (Wed, 25 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a JSON interface for getting EWS queue status
https://bugs.webkit.org/show_bug.cgi?id=126182
Reviewed by Ryosuke Niwa.
The current goal is to add an indicator of how many patches are in the queue, and
the JSON also includes some other information that was easy to add.
* QueueStatusServer/app.yaml: Updated version for deployment.
* QueueStatusServer/handlers/queuestatusjson.py: Added. Returns a JSON with some
bot and patch queue information.
* QueueStatusServer/index.yaml: Added an index for a new query that only returns
bot ids.
* QueueStatusServer/main.py: Map /queue-status-json/ directory to QueueStatusJSON
handler.
* QueueStatusServer/config: Added property svn:ignore.
* QueueStatusServer/filters: Added property svn:ignore.
* QueueStatusServer/loggers: Added property svn:ignore.
* QueueStatusServer/handlers: Added property svn:ignore.
* QueueStatusServer/model: Added property svn:ignore.
Ignore compiled *.pyc files in all directories they appear in when running locally.</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="#trunkToolsQueueStatusServerindexyaml">trunk/Tools/QueueStatusServer/index.yaml</a></li>
<li><a href="#trunkToolsQueueStatusServermainpy">trunk/Tools/QueueStatusServer/main.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsQueueStatusServerhandlersqueuestatusjsonpy">trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkToolsQueueStatusServerconfig">trunk/Tools/QueueStatusServer/config/</a></li>
<li><a href="#trunkToolsQueueStatusServerfilters">trunk/Tools/QueueStatusServer/filters/</a></li>
<li><a href="#trunkToolsQueueStatusServerhandlers">trunk/Tools/QueueStatusServer/handlers/</a></li>
<li><a href="#trunkToolsQueueStatusServerloggers">trunk/Tools/QueueStatusServer/loggers/</a></li>
<li><a href="#trunkToolsQueueStatusServermodel">trunk/Tools/QueueStatusServer/model/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161061 => 161062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-25 00:41:59 UTC (rev 161061)
+++ trunk/Tools/ChangeLog 2013-12-25 09:13:47 UTC (rev 161062)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-12-23 Alexey Proskuryakov <ap@apple.com>
+
+ Add a JSON interface for getting EWS queue status
+ https://bugs.webkit.org/show_bug.cgi?id=126182
+
+ Reviewed by Ryosuke Niwa.
+
+ The current goal is to add an indicator of how many patches are in the queue, and
+ the JSON also includes some other information that was easy to add.
+
+ * QueueStatusServer/app.yaml: Updated version for deployment.
+
+ * QueueStatusServer/handlers/queuestatusjson.py: Added. Returns a JSON with some
+ bot and patch queue information.
+
+ * QueueStatusServer/index.yaml: Added an index for a new query that only returns
+ bot ids.
+
+ * QueueStatusServer/main.py: Map /queue-status-json/ directory to QueueStatusJSON
+ handler.
+
+ * QueueStatusServer/config: Added property svn:ignore.
+ * QueueStatusServer/filters: Added property svn:ignore.
+ * QueueStatusServer/loggers: Added property svn:ignore.
+ * QueueStatusServer/handlers: Added property svn:ignore.
+ * QueueStatusServer/model: Added property svn:ignore.
+ Ignore compiled *.pyc files in all directories they appear in when running locally.
+
</ins><span class="cx"> 2013-12-23 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the build after r161017
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerappyaml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/app.yaml (161061 => 161062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/app.yaml 2013-12-25 00:41:59 UTC (rev 161061)
+++ trunk/Tools/QueueStatusServer/app.yaml 2013-12-25 09:13:47 UTC (rev 161062)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> application: webkit-queues
</span><del>-version: 108593 # Bugzilla bug ID of last major change
</del><ins>+version: 161062 # 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="trunkToolsQueueStatusServerconfig"></a>
<div class="propset"><h4>Property changes: trunk/Tools/QueueStatusServer/config</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<a id="trunkToolsQueueStatusServerfilters"></a>
<div class="propset"><h4>Property changes: trunk/Tools/QueueStatusServer/filters</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<a id="trunkToolsQueueStatusServerhandlers"></a>
<div class="propset"><h4>Property changes: trunk/Tools/QueueStatusServer/handlers</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<a id="trunkToolsQueueStatusServerhandlersqueuestatusjsonpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py (0 => 161062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py (rev 0)
+++ trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py 2013-12-25 09:13:47 UTC (rev 161062)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+# Copyright (C) 2013 Apple. 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.
+
+import datetime
+import itertools
+
+from google.appengine.ext import webapp
+from google.appengine.ext.webapp import template
+
+from model.queues import Queue
+from model.queuestatus import QueueStatus
+
+# Fall back to simplejson, because we are still on Python 2.5.
+try:
+ import json
+except ImportError:
+ import simplejson as json
+
+
+class QueueStatusJSON(webapp.RequestHandler):
+ def _rows_for_work_items(self, queue):
+ queued_items = queue.work_items()
+ active_items = queue.active_work_items()
+ if not queued_items:
+ return []
+
+ rows = []
+ for item_id in queued_items.item_ids:
+ 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 ""
+ rows.append({
+ "attachment_id": item_id,
+ "active": active_items and active_items.time_for_item(item_id) != None,
+ "status": status,
+ "status_page": self.request.host_url + "/patch/" + str(item_id),
+ })
+ return rows
+
+ def _bots(self, queue):
+ bot_id_statuses = QueueStatus.all(projection=['bot_id'], distinct=True).filter('queue_name =', queue.name()).fetch(500)
+ bot_ids = list(entry.bot_id for entry in bot_id_statuses)
+ result = []
+ for bot_id in bot_ids:
+ status = QueueStatus.all().filter('bot_id =', bot_id).order('-date').get()
+ result.append({
+ "bot_id": bot_id,
+ "status_page": self.request.host_url + "/queue-status/" + queue.name() + "/bots/" + bot_id,
+ "latest_message": status.message,
+ "latest_message_time": status.date,
+ "latest_output": self.request.host_url + "/results/" + str(status.key().id()) if status.results_file else None,
+ "active_bug_id": status.active_bug_id,
+ "active_patch_id": status.active_patch_id,
+ })
+ return result
+
+ def get(self, queue_name):
+ 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 = {
+ "status_page": self.request.host_url + "/queue-status/" + queue_name,
+ "queue": self._rows_for_work_items(queue),
+ "bots": self._bots(queue),
+ }
+ dthandler = lambda obj: obj.isoformat() if isinstance(obj, datetime.datetime) or isinstance(obj, datetime.date) else None
+ self.response.out.write(json.dumps(status, default=dthandler))
</ins><span class="cx">Property changes on: trunk/Tools/QueueStatusServer/handlers/queuestatusjson.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="trunkToolsQueueStatusServerindexyaml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/index.yaml (161061 => 161062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/index.yaml 2013-12-25 00:41:59 UTC (rev 161061)
+++ trunk/Tools/QueueStatusServer/index.yaml 2013-12-25 09:13:47 UTC (rev 161062)
</span><span class="lines">@@ -63,6 +63,12 @@
</span><span class="cx">
</span><span class="cx"> - kind: QueueStatus
</span><span class="cx"> properties:
</span><ins>+ - name: bot_id
+ - name: date
+ direction: desc
+
+- kind: QueueStatus
+ properties:
</ins><span class="cx"> - name: queue_name
</span><span class="cx"> - name: date
</span><span class="cx"> direction: desc
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerloggers"></a>
<div class="propset"><h4>Property changes: trunk/Tools/QueueStatusServer/loggers</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<a id="trunkToolsQueueStatusServermainpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/main.py (161061 => 161062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/main.py 2013-12-25 00:41:59 UTC (rev 161061)
+++ trunk/Tools/QueueStatusServer/main.py 2013-12-25 09:13:47 UTC (rev 161062)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> from handlers.patchstatus import PatchStatus
</span><span class="cx"> from handlers.queuecharts import QueueCharts
</span><span class="cx"> from handlers.queuestatus import QueueStatus
</span><ins>+from handlers.queuestatusjson import QueueStatusJSON
</ins><span class="cx"> from handlers.recentstatus import QueuesOverview
</span><span class="cx"> from handlers.releasepatch import ReleasePatch
</span><span class="cx"> from handlers.showresults import ShowResults
</span><span class="lines">@@ -69,6 +70,7 @@
</span><span class="cx"> (r'/queue-charts/(.*)', QueueCharts),
</span><span class="cx"> (r'/queue-status/(.*)/bots/(.*)', QueueStatus),
</span><span class="cx"> (r'/queue-status/(.*)', QueueStatus),
</span><ins>+ (r'/queue-status-json/(.*)', QueueStatusJSON),
</ins><span class="cx"> (r'/next-patch/(.*)', NextPatch),
</span><span class="cx"> (r'/release-patch', ReleasePatch),
</span><span class="cx"> ('/update-status', UpdateStatus),
</span></span></pre></div>
<a id="trunkToolsQueueStatusServermodel"></a>
<div class="propset"><h4>Property changes: trunk/Tools/QueueStatusServer/model</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
</div>
</body>
</html>