[Toaster] [review-request][PATCH 2/4] toaster: Remove Toaster exceptions section of build dashboard
Elliot Smith
elliot.smith at intel.com
Thu Oct 15 01:01:22 PDT 2015
Fatal build errors were displayed as exceptions, and highlighted
with less severity than they deserved.
Roll back to treating Toaster exceptions as errors by removing
the toaster_exceptions member on Build objects and displaying
EXCEPTION events in the errors section on the dashboard.
[YOCTO #8320]
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
---
bitbake/lib/toaster/orm/models.py | 4 --
.../toastergui/templates/builddashboard.html | 45 ++--------------------
2 files changed, 4 insertions(+), 45 deletions(-)
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 6ca45e0..a784b1b 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -348,10 +348,6 @@ class Build(models.Model):
return Build.BUILD_OUTCOME[int(self.outcome)][1]
@property
- def toaster_exceptions(self):
- return self.logmessage_set.filter(level=LogMessage.EXCEPTION)
-
- @property
def errors(self):
return (self.logmessage_set.filter(level=LogMessage.ERROR) |
self.logmessage_set.filter(level=LogMessage.EXCEPTION) |
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
index fc6cae6..75ca8bc 100644
--- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html
+++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
@@ -44,14 +44,6 @@
{%endif%}
</div>
- {% if build.toaster_exceptions.count > 0 %}
- <div class="row">
- <small class="pull-right">
- <i class="icon-question-sign get-help get-help-blue" title="" data-original-title="Toaster exceptions do not affect your build: only the operation of Toaster"></i>
- <a class="show-exceptions" href="#exceptions">Toaster threw {{build.toaster_exceptions.count}} exception{{build.toaster_exceptions.count|pluralize}}</a>
- </small>
- </div>
- {% endif %}
</div>
</div>
@@ -69,12 +61,10 @@
<div class="accordion-body collapse in" id="collapse-errors">
<div class="accordion-inner">
<div class="span10">
- {% for error in logmessages %}
- {% if error.level == 2 or error.level == 3 %}
- <div class="alert alert-error">
- <pre>{{error.message}}</pre>
- </div>
- {% endif %}
+ {% for error in build.errors %}
+ <div class="alert alert-error">
+ <pre>{{error.message}}</pre>
+ </div>
{% endfor %}
</div>
</div>
@@ -271,33 +261,6 @@
</div>
{% endif %}
-
-{% if build.toaster_exceptions.count > 0 %}
-<div class="accordion span10 pull-right" id="exceptions">
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle exception toggle-exceptions">
- <h2 id="exception-toggle">
- <i class="icon-warning-sign"></i>
- {{build.toaster_exceptions.count}} Toaster exception{{build.toaster_exceptions.count|pluralize}}
- </h2>
- </a>
- </div>
- <div class="accordion-body collapse" id="collapse-exceptions">
- <div class="accordion-inner">
- <div class="span10">
- {% for exception in build.toaster_exceptions %}
- <div class="alert alert-exception">
- <pre>{{exception.message}}</pre>
- </div>
- {% endfor %}
- </div>
- </div>
- </div>
- </div>
-</div>
-{% endif %}
-
<script type="text/javascript">
$(document).ready(function() {
//show warnings section when requested from the previous page
--
Elliot Smith
Software Engineer
Intel OTC
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
More information about the toaster
mailing list