From 348db7600c59c3b75cfaf69a3b5c4dcbc504d1da Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 5 Feb 2010 20:32:07 +0000
Subject: [PATCH] * hydra: on build page, show tail of log on first tab when
buildstatus == 1 (this specific build failed)
---
src/lib/Hydra/Controller/Build.pm | 6 ++++++
src/root/build.tt | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 11dfca3f..381714c0 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -43,6 +43,12 @@ sub view_build : Chained('build') PathPart('') Args(0) {
(my $cachedBuildStep) = $c->model('DB::BuildSteps')->search({ outpath => $build->outpath }, {}) ;
$c->stash->{cachedBuild} = $cachedBuildStep->build if defined $cachedBuildStep;
}
+
+ (my $lastBuildStep) = $build->buildsteps->search({},{order_by => "stepnr", rows => 1});
+ if ($build->resultInfo->buildstatus == 1 && $lastBuildStep && isValidPath($lastBuildStep->logfile)) {
+ my $path = $lastBuildStep->logfile;
+ $c->stash->{logtext} = `tail -n 50 $path`;
+ }
}
diff --git a/src/root/build.tt b/src/root/build.tt
index 5caff96d..2ac1bc16 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -189,7 +189,8 @@
[% HTML.escape(build.resultInfo.errormsg) -%]
</pre>
[% END %]
- [% ELSIF build.schedulingInfo.busy %]
+ [% END %]
+ [% IF logtext %]
<h2>Log</h2>
<pre class="buildlog">