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

Serve raw uncompressed logs directly

Browse source
This commit is contained in:
Eelco Dolstra 2013-08-30 18:11:03 +00:00
parent fd7e37ef89
commit 6655ada236
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,7 +145,6 @@ sub showLog {
my ($c, $mode, $drvPath, @outPaths) = @_; my ($c, $mode, $drvPath, @outPaths) = @_;
my $logPath = findLog($c, $drvPath, @outPaths); my $logPath = findLog($c, $drvPath, @outPaths);
print STDERR "log = $logPath\n";
notFound($c, "The build log of derivation ‘$drvPath’ is not available.") unless defined $logPath; notFound($c, "The build log of derivation ‘$drvPath’ is not available.") unless defined $logPath;
@ -159,9 +158,13 @@ sub showLog {
} }
elsif ($mode eq "raw") { elsif ($mode eq "raw") {
if ($logPath !~ /.bz2$/) {
$c->serve_static_file($logPath);
} else {
$c->stash->{'plain'} = { data => (scalar logContents($logPath)) || " " }; $c->stash->{'plain'} = { data => (scalar logContents($logPath)) || " " };
$c->forward('Hydra::View::Plain'); $c->forward('Hydra::View::Plain');
} }
}
elsif ($mode eq "tail-reload") { elsif ($mode eq "tail-reload") {
my $url = $c->request->uri->as_string; my $url = $c->request->uri->as_string;