Title: [174304] trunk/Tools/QueueStatusServer
- Revision
- 174304
- Author
- [email protected]
- Date
- 2014-10-03 16:48:52 -0700 (Fri, 03 Oct 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Tools/QueueStatusServer/app.yaml (174303 => 174304)
--- 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)
@@ -1,5 +1,5 @@
application: webkit-queues
-version: 174302 # Bugzilla bug ID of last major change
+version: 174304 # Bugzilla bug ID of last major change
runtime: python
api_version: 1
Modified: trunk/Tools/QueueStatusServer/handlers/statusbubble.py (174303 => 174304)
--- 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)
@@ -138,7 +138,8 @@
bubble["details_message"] = "Pass\n\n" + self._iso_time(statuses[0].date)
elif statuses[0].message == "Fail":
bubble["state"] = "fail"
- bubble["details_message"] = statuses[1].message + "\n\n" + self._iso_time(statuses[0].date)
+ 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)
elif statuses[0].message == "Error: " + queue.name() + " did not process patch.":
bubble["state"] = "none"
bubble["details_message"] = "The patch is no longer eligible for processing."
@@ -150,7 +151,8 @@
bubble["details_message"] += "\n".join([status.message for status in statuses[1:]]) + "\n\n" + self._iso_time(statuses[0].date)
elif statuses[0].message == "Error: " + queue.name() + " unable to apply patch.":
bubble["state"] = "fail"
- bubble["details_message"] = statuses[1].message + "\n\n" + self._iso_time(statuses[0].date)
+ 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)
bubble["failed_to_apply"] = True
elif statuses[0].message.startswith("Error: "):
bubble["state"] = "error"
Modified: trunk/Tools/QueueStatusServer/model/patchlog.py (174303 => 174304)
--- 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)
@@ -41,7 +41,7 @@
finished = db.BooleanProperty(default=False)
wait_duration = db.IntegerProperty()
process_duration = db.IntegerProperty()
- latest_message = db.StringProperty()
+ latest_message = db.StringProperty(multiline=True)
@classmethod
def lookup(cls, attachment_id, queue_name):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
