<!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>[174304] trunk/Tools/QueueStatusServer</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/174304">174304</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-10-03 16:48:52 -0700 (Fri, 03 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bugzilla status bubble displays an exception showing attachment 175738
https://bugs.webkit.org/show_bug.cgi?id=137410
Reviewed by Tim Horton.
* QueueStatusServer/app.yaml: Update version.
* QueueStatusServer/handlers/statusbubble.py: (StatusBubble._build_bubble):
Don't fail even if expected status message is missing.
* QueueStatusServer/model/patchlog.py: (PatchLog): Quick unrelated fix - define
the field in the same way it's defined in QueueStatus table.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsQueueStatusServerappyaml">trunk/Tools/QueueStatusServer/app.yaml</a></li>
<li><a href="#trunkToolsQueueStatusServerhandlersstatusbubblepy">trunk/Tools/QueueStatusServer/handlers/statusbubble.py</a></li>
<li><a href="#trunkToolsQueueStatusServermodelpatchlogpy">trunk/Tools/QueueStatusServer/model/patchlog.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsQueueStatusServerappyaml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/app.yaml (174303 => 174304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/app.yaml 2014-10-03 23:36:54 UTC (rev 174303)
+++ trunk/Tools/QueueStatusServer/app.yaml 2014-10-03 23:48:52 UTC (rev 174304)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> application: webkit-queues
</span><del>-version: 174302 # Bugzilla bug ID of last major change
</del><ins>+version: 174304 # 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="trunkToolsQueueStatusServerhandlersstatusbubblepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/handlers/statusbubble.py (174303 => 174304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/handlers/statusbubble.py 2014-10-03 23:36:54 UTC (rev 174303)
+++ trunk/Tools/QueueStatusServer/handlers/statusbubble.py 2014-10-03 23:48:52 UTC (rev 174304)
</span><span class="lines">@@ -138,7 +138,8 @@
</span><span class="cx"> bubble["details_message"] = "Pass\n\n" + self._iso_time(statuses[0].date)
</span><span class="cx"> elif statuses[0].message == "Fail":
</span><span class="cx"> bubble["state"] = "fail"
</span><del>- bubble["details_message"] = statuses[1].message + "\n\n" + self._iso_time(statuses[0].date)
</del><ins>+ message_to_display = statuses[1].message if len(statuses) > 1 else statuses[0].message
+ bubble["details_message"] = message_to_display + "\n\n" + self._iso_time(statuses[0].date)
</ins><span class="cx"> elif statuses[0].message == "Error: " + queue.name() + " did not process patch.":
</span><span class="cx"> bubble["state"] = "none"
</span><span class="cx"> bubble["details_message"] = "The patch is no longer eligible for processing."
</span><span class="lines">@@ -150,7 +151,8 @@
</span><span class="cx"> bubble["details_message"] += "\n".join([status.message for status in statuses[1:]]) + "\n\n" + self._iso_time(statuses[0].date)
</span><span class="cx"> elif statuses[0].message == "Error: " + queue.name() + " unable to apply patch.":
</span><span class="cx"> bubble["state"] = "fail"
</span><del>- bubble["details_message"] = statuses[1].message + "\n\n" + self._iso_time(statuses[0].date)
</del><ins>+ message_to_display = statuses[1].message if len(statuses) > 1 else statuses[0].message
+ bubble["details_message"] = message_to_display + "\n\n" + self._iso_time(statuses[0].date)
</ins><span class="cx"> bubble["failed_to_apply"] = True
</span><span class="cx"> elif statuses[0].message.startswith("Error: "):
</span><span class="cx"> bubble["state"] = "error"
</span></span></pre></div>
<a id="trunkToolsQueueStatusServermodelpatchlogpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/model/patchlog.py (174303 => 174304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/model/patchlog.py 2014-10-03 23:36:54 UTC (rev 174303)
+++ trunk/Tools/QueueStatusServer/model/patchlog.py 2014-10-03 23:48:52 UTC (rev 174304)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> finished = db.BooleanProperty(default=False)
</span><span class="cx"> wait_duration = db.IntegerProperty()
</span><span class="cx"> process_duration = db.IntegerProperty()
</span><del>- latest_message = db.StringProperty()
</del><ins>+ latest_message = db.StringProperty(multiline=True)
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def lookup(cls, attachment_id, queue_name):
</span></span></pre>
</div>
</div>
</body>
</html>