Diff
Modified: trunk/Tools/ChangeLog (174014 => 174015)
--- trunk/Tools/ChangeLog 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/ChangeLog 2014-09-26 18:49:30 UTC (rev 174015)
@@ -1,5 +1,33 @@
2014-09-26 Alexey Proskuryakov <[email protected]>
+ Get rid of webkit-queues dashboard
+ https://bugs.webkit.org/show_bug.cgi?id=137141
+
+ Reviewed by Ryosuke Niwa.
+
+ * QueueStatusServer/app.yaml: Updated version.
+
+ * QueueStatusServer/templates/dashboard.html: Removed.
+ * QueueStatusServer/handlers/dashboard.py: Removed.
+ * QueueStatusServer/main.py:
+ Kill it!
+
+ * QueueStatusServer/stylesheets/common.css: Copied from Tools/QueueStatusServer/stylesheets/dashboard.css.
+ (.status-cell): Deleted.
+ (.status-cell:hover): Deleted.
+ (.status-cell.pass): Deleted.
+ (.status-cell.fail): Deleted.
+ (.status-cell.pending): Deleted.
+ (.status-cell.error): Deleted.
+ * QueueStatusServer/stylesheets/dashboard.css: Removed.
+ * QueueStatusServer/templates/activebots.html:
+ * QueueStatusServer/templates/patch.html:
+ * QueueStatusServer/templates/queuestatus.html:
+ * QueueStatusServer/templates/recentstatus.html:
+ Renamed dashboard.css to common.css, and removed dashboard-only rules.
+
+2014-09-26 Alexey Proskuryakov <[email protected]>
+
Get rid of Retry status in webkit-queues
https://bugs.webkit.org/show_bug.cgi?id=137135
Modified: trunk/Tools/QueueStatusServer/app.yaml (174014 => 174015)
--- trunk/Tools/QueueStatusServer/app.yaml 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/app.yaml 2014-09-26 18:49:30 UTC (rev 174015)
@@ -1,5 +1,5 @@
application: webkit-queues
-version: 174009 # Bugzilla bug ID of last major change
+version: 174015 # Bugzilla bug ID of last major change
runtime: python
api_version: 1
Deleted: trunk/Tools/QueueStatusServer/handlers/dashboard.py (174014 => 174015)
--- trunk/Tools/QueueStatusServer/handlers/dashboard.py 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/handlers/dashboard.py 2014-09-26 18:49:30 UTC (rev 174015)
@@ -1,64 +0,0 @@
-# Copyright (C) 2009 Google 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:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * 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.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-# OWNER OR 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 operator
-
-from google.appengine.ext import webapp
-from google.appengine.ext.webapp import template
-
-from model.attachment import Attachment
-from model.queues import Queue
-
-
-class Dashboard(webapp.RequestHandler):
- # We may want to sort these?
- _ordered_queues = Queue.all()
- _header_names = [queue.short_name() for queue in _ordered_queues]
-
- def _build_bubble(self, attachment, queue):
- queue_status = attachment.status_for_queue(queue)
- bubble = {
- "status_class": attachment.state_from_queue_status(queue_status) if queue_status else "none",
- "status_date": queue_status.date if queue_status else None,
- }
- return bubble
-
- def _build_row(self, attachment):
- row = {
- "bug_id": attachment.bug_id(),
- "attachment_id": attachment.id,
- "bubbles": [self._build_bubble(attachment, queue) for queue in self._ordered_queues],
- }
- return row
-
- def get(self):
- template_values = {
- "headers": self._header_names,
- "rows": [self._build_row(attachment) for attachment in Attachment.recent(limit=25)],
- }
- self.response.out.write(template.render("templates/dashboard.html", template_values))
Modified: trunk/Tools/QueueStatusServer/main.py (174014 => 174015)
--- trunk/Tools/QueueStatusServer/main.py 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/main.py 2014-09-26 18:49:30 UTC (rev 174015)
@@ -34,7 +34,6 @@
from google.appengine.ext.webapp.util import run_wsgi_app
from handlers.activebots import ActiveBots
-from handlers.dashboard import Dashboard
from handlers.gc import GC
from handlers.nextpatch import NextPatch
from handlers.patch import Patch
@@ -60,7 +59,6 @@
routes = [
('/', QueuesOverview),
- ('/dashboard', Dashboard),
('/gc', GC),
('/sync-queue-logs', SyncQueueLogs),
(r'/patch-status/(.*)/(.*)', PatchStatus),
Copied: trunk/Tools/QueueStatusServer/stylesheets/common.css (from rev 174008, trunk/Tools/QueueStatusServer/stylesheets/dashboard.css) (0 => 174015)
--- trunk/Tools/QueueStatusServer/stylesheets/common.css (rev 0)
+++ trunk/Tools/QueueStatusServer/stylesheets/common.css 2014-09-26 18:49:30 UTC (rev 174015)
@@ -0,0 +1,98 @@
+body {
+ font-family: Verdana, Helvetica, sans-serif;
+ width: 600px;
+ padding: 0px;
+ color: #444;
+}
+h1 {
+ background-color: #EEE;
+ color: #444;
+ font-size: 14pt;
+ font-style: italic;
+ margin: 0px;
+ padding: 5px;
+}
+h2 {
+ background-color: #AAA;
+ color: white;
+ font-weight: bold;
+ font-size: 9pt;
+ margin: 0px;
+ padding: 5px;
+}
+ul {
+ margin: 0px;
+ padding: 0px;
+ list-style: none;
+}
+li {
+ padding: 5px;
+}
+table {
+ border-spacing: 0px;
+}
+th {
+ background-color: #AAA;
+ color: white;
+ padding: 5px;
+ width: 100px;
+ font-size: 9pt;
+}
+td {
+ text-align: center;
+}
+tr:hover, li:hover {
+ background-color: #EEE;
+}
+
+.status-group {
+ font-size: 90%;
+}
+
+.status-bug {
+ font-weight: bold;
+}
+
+.status-group ul {
+ font-size: 90%;
+}
+
+.status-group ul li {
+ padding: 2px 0 2px 7px;
+ overflow: hidden;
+}
+
+.status-group ul li:hover {
+ background: #ddd;
+}
+
+.status-date {
+ color: #AAA;
+ float: right;
+ font-size: 8pt;
+}
+
+.queue_bubble {
+ border: 1px solid black;
+ margin-bottom: 10px;
+ border-radius: 10px;
+ padding: 5px;
+}
+.queue_name {
+ float:left;
+}
+.last_heard_from {
+ float: right;
+}
+.status_text {
+ clear: both;
+}
+.alive {
+ background-color: #8FDF5F;
+}
+.behind {
+ background-color: #FFFC6C;
+}
+.dead {
+ background-color: #E98080;
+}
Deleted: trunk/Tools/QueueStatusServer/stylesheets/dashboard.css (174014 => 174015)
--- trunk/Tools/QueueStatusServer/stylesheets/dashboard.css 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/stylesheets/dashboard.css 2014-09-26 18:49:30 UTC (rev 174015)
@@ -1,127 +0,0 @@
-body {
- font-family: Verdana, Helvetica, sans-serif;
- width: 600px;
- padding: 0px;
- color: #444;
-}
-h1 {
- background-color: #EEE;
- color: #444;
- font-size: 14pt;
- font-style: italic;
- margin: 0px;
- padding: 5px;
-}
-h2 {
- background-color: #AAA;
- color: white;
- font-weight: bold;
- font-size: 9pt;
- margin: 0px;
- padding: 5px;
-}
-ul {
- margin: 0px;
- padding: 0px;
- list-style: none;
-}
-li {
- padding: 5px;
-}
-table {
- border-spacing: 0px;
-}
-th {
- background-color: #AAA;
- color: white;
- padding: 5px;
- width: 100px;
- font-size: 9pt;
-}
-td {
- text-align: center;
-}
-tr:hover, li:hover {
- background-color: #EEE;
-}
-
-.status-group {
- font-size: 90%;
-}
-
-.status-bug {
- font-weight: bold;
-}
-
-.status-group ul {
- font-size: 90%;
-}
-
-.status-group ul li {
- padding: 2px 0 2px 7px;
- overflow: hidden;
-}
-
-.status-group ul li:hover {
- background: #ddd;
-}
-
-.status-date {
- color: #AAA;
- float: right;
- font-size: 8pt;
-}
-
-.status-cell {
- margin: 1px;
- padding: 1px 2px;
- font-size: 9pt;
- border: 1px solid transparent;
-}
-.status-cell:hover {
- border: 1px solid black;
-}
-.status-cell.pass {
- background-color: #8FDF5F;
- cursor: pointer;
- /* border: 1px solid #4F8530; */
-}
-.status-cell.fail {
- background-color: #E98080;
- cursor: pointer;
- /* border: 1px solid #A77272; */
-}
-.status-cell.pending {
- background-color: #FFFC6C;
- cursor: pointer;
- /* border: 1px solid #C5C56D; */
-}
-.status-cell.error {
- background-color: #E0B0FF;
- cursor: pointer;
- /* border: 1px solid #ACA0B3; */
-}
-.queue_bubble {
- border: 1px solid black;
- margin-bottom: 10px;
- border-radius: 10px;
- padding: 5px;
-}
-.queue_name {
- float:left;
-}
-.last_heard_from {
- float: right;
-}
-.status_text {
- clear: both;
-}
-.alive {
- background-color: #8FDF5F;
-}
-.behind {
- background-color: #FFFC6C;
-}
-.dead {
- background-color: #E98080;
-}
\ No newline at end of file
Modified: trunk/Tools/QueueStatusServer/templates/activebots.html (174014 => 174015)
--- trunk/Tools/QueueStatusServer/templates/activebots.html 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/templates/activebots.html 2014-09-26 18:49:30 UTC (rev 174015)
@@ -2,9 +2,9 @@
<html>
<head>
<title>WebKit Queues</title>
-<link type="text/css" rel="stylesheet" href="" />
+<link type="text/css" rel="stylesheet" href="" />
<style>
-/* Override the generic table styles from dashboard.css */
+/* Override the generic table styles from common.css */
td {
text-align: left;
}
Deleted: trunk/Tools/QueueStatusServer/templates/dashboard.html (174014 => 174015)
--- trunk/Tools/QueueStatusServer/templates/dashboard.html 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/templates/dashboard.html 2014-09-26 18:49:30 UTC (rev 174015)
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>WebKit Bot Status</title>
-<link type="text/css" rel="stylesheet" href="" />
-<script>
-function statusDetail(patch_id) {
- // FIXME: We'd like to use AJAX to show the details on this page.
- window.location = "/patch/" + patch_id
-}
-</script>
-</head>
-<body>
-<h1>WebKit Bot Status</h1>
-<table>
- <thead>
- <tr>
- <th>Bug</th>
- <th>Attachment</th>
- {% for header in headers %}
- <th>{{ header }}</th>
- {% endfor %}
- </tr>
- </thead>
- <tbody>{% for row in rows %}
- <tr>
- <td class="status-cell">
- {{ row.bug_id|force_escape|webkit_bug_id|safe }}
- </td>
- <td class="status-cell">
- {{ row.attachment_id|force_escape|webkit_attachment_id|safe }}
- </td>
- {% for bubble in row.bubbles %}
- <td class="status-cell {{ bubble.status_class }}"
- {% if bubble.status %}
- _onclick_="statusDetail({{ row.attachment_id }})"
- title="{{ bubble.status_date|timesince }}"
- {% endif %}>
- </td>
- {% endfor %}
- </tr>{% endfor %}
- </tbody>
-</table>
-</html>
Modified: trunk/Tools/QueueStatusServer/templates/patch.html (174014 => 174015)
--- trunk/Tools/QueueStatusServer/templates/patch.html 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/templates/patch.html 2014-09-26 18:49:30 UTC (rev 174015)
@@ -2,7 +2,7 @@
<html>
<head>
<title>Patch Status</title>
-<link type="text/css" rel="stylesheet" href="" />
+<link type="text/css" rel="stylesheet" href="" />
</head>
<body>
<h1>
Modified: trunk/Tools/QueueStatusServer/templates/queuestatus.html (174014 => 174015)
--- trunk/Tools/QueueStatusServer/templates/queuestatus.html 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/templates/queuestatus.html 2014-09-26 18:49:30 UTC (rev 174015)
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{ page_title }}</title>
-<link type="text/css" rel="stylesheet" href="" />
+<link type="text/css" rel="stylesheet" href="" />
</head>
<body>
<h1>{{ page_title }}</h1>
Modified: trunk/Tools/QueueStatusServer/templates/recentstatus.html (174014 => 174015)
--- trunk/Tools/QueueStatusServer/templates/recentstatus.html 2014-09-26 18:26:29 UTC (rev 174014)
+++ trunk/Tools/QueueStatusServer/templates/recentstatus.html 2014-09-26 18:49:30 UTC (rev 174015)
@@ -2,7 +2,7 @@
<html>
<head>
<title>WebKit Queue Status</title>
-<link type="text/css" rel="stylesheet" href="" />
+<link type="text/css" rel="stylesheet" href="" />
</head>
<body>
<h1>WebKit Queue Status</h1>
