the-distro/hydra
1
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

using backquote as argument resulted in only first line as first argument to removeAsciiEscapes

Browse source
This commit is contained in:
Rob Vermaas 2011-06-10 10:48:51 +00:00
parent 48b435c2de
commit 5d166150f9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib/Hydra/Controller/Build.pm
View file

@ -55,7 +55,8 @@ sub view_build : Chained('build') PathPart('') Args(0) {
(my $lastBuildStep) = $build->buildsteps->search({},{order_by => "stepnr DESC", rows => 1}); (my $lastBuildStep) = $build->buildsteps->search({},{order_by => "stepnr DESC", rows => 1});
my $path = defined $lastBuildStep ? $lastBuildStep->logfile : "" ; my $path = defined $lastBuildStep ? $lastBuildStep->logfile : "" ;
if (defined $build->resultInfo && ($build->resultInfo->buildstatus == 1 || $build->resultInfo->buildstatus == 6) && !($path eq "") && -f $lastBuildStep->logfile) { if (defined $build->resultInfo && ($build->resultInfo->buildstatus == 1 || $build->resultInfo->buildstatus == 6) && !($path eq "") && -f $lastBuildStep->logfile) {
$c->stash->{logtext} = removeAsciiEscapes(`tail -n 50 $path`); my $logtext = `tail -n 50 $path`;
$c->stash->{logtext} = removeAsciiEscapes($logtext);
} }
if($build->finished) { if($build->finished) {

3
src/script/hydra_build.pl.in
View file

@ -156,7 +156,8 @@ sub sendEmailNotification {
my $loglines = 50; my $loglines = 50;
my $logfile = $build->resultInfo->logfile; my $logfile = $build->resultInfo->logfile;
my $logtext = defined $logfile && -e $logfile ? removeAsciiEscapes(`tail -$loglines $logfile`) : "No logfile available.\n"; my $logtext = defined $logfile && -e $logfile ? `tail -$loglines $logfile` : "No logfile available.\n";
$logtext = removeAsciiEscapes($logtext);
my $body = "Hi,\n" my $body = "Hi,\n"
. "\n" . "\n"