snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

hydra: make sure viewing logs works when logs are bz2'd

Browse source
This commit is contained in:
Rob Vermaas 2010-08-10 13:11:41 +00:00
parent 7bd11b87f0
commit f7ce960b96
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,11 +106,16 @@ sub view_log : Chained('build') PathPart('log') {
sub showLog { sub showLog {
my ($c, $path, $mode) = @_; my ($c, $path, $mode) = @_;
notFound($c, "Log file $path no longer exists.") unless -f $path; my $fallbackpath = -f $path ? $path : "$path.bz2";
notFound($c, "Log file $path no longer exists.") unless -f $fallbackpath;
$path = $fallbackpath;
my $pipestart = ($path =~ /.bz2$/ ? "cat $path | bzip2 -d" : "cat $path") ;
if (!$mode) { if (!$mode) {
# !!! quick hack # !!! quick hack
my $pipeline = ($path =~ /.bz2$/ ? "cat $path | bzip2 -d" : "cat $path") my $pipeline = $pipestart
. " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -" . " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"
. " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " - | tail -n +2"; . " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " - | tail -n +2";
@ -119,11 +124,12 @@ sub showLog {
} }
elsif ($mode eq "raw") { elsif ($mode eq "raw") {
$c->serve_static_file($path); $c->stash->{'plain'} = { data => (scalar `$pipestart`) || " " };
$c->forward('Hydra::View::Plain');
} }
elsif ($mode eq "tail") { elsif ($mode eq "tail") {
$c->stash->{'plain'} = { data => (scalar `tail -n 50 $path`) || " " }; $c->stash->{'plain'} = { data => (scalar `$pipestart | tail -n 50`) || " " };
$c->forward('Hydra::View::Plain'); $c->forward('Hydra::View::Plain');
} }