lix-project/hydra
2
0
Fork 2
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Browse source
This commit is contained in:
Eelco Dolstra 2008-11-28 16:53:53 +00:00
parent 95381d7d2c
commit cbc046edc5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Hydra/lib/Hydra/Controller/Root.pm
View file

@ -669,7 +669,7 @@ sub log :Local {
$c->stash->{build} = $build; $c->stash->{build} = $build;
# !!! should be done in the view (as a TT plugin). # !!! should be done in the view (as a TT plugin).
$c->stash->{logtext} = loadLog($build->resultInfo->logfile); $c->stash->{logtext} = loadLog($c, $build->resultInfo->logfile);
} }
@ -689,18 +689,19 @@ sub nixlog :Local {
$c->stash->{step} = $step; $c->stash->{step} = $step;
# !!! should be done in the view (as a TT plugin). # !!! should be done in the view (as a TT plugin).
$c->stash->{logtext} = loadLog($step->logfile); $c->stash->{logtext} = loadLog($c, $step->logfile);
} }
sub loadLog { sub loadLog {
my ($path) = @_; my ($c, $path) = @_;
die unless defined $path; die unless defined $path;
# !!! quick hack # !!! quick hack
my $pipeline = ($path =~ /.bz2$/ ? "cat $path | bzip2 -d" : "cat $path") my $pipeline = ($path =~ /.bz2$/ ? "cat $path | bzip2 -d" : "cat $path")
. " | nix-log2xml | xsltproc xsl/mark-errors.xsl - | xsltproc xsl/log2html.xsl - | tail -n +2"; . " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"
. " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " - | tail -n +2";
return `$pipeline`; return `$pipeline`;
} }