ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Stream logs if possible and remove size limit

Browse Source
This commit is contained in:
Eelco Dolstra
2015-07-08 19:04:08 +02:00
parent f5548dc225
commit 0da08df4eb
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/Hydra/Controller/Build.pm
View File

@ -136,9 +136,12 @@ sub showLog {
notFound($c, "The build log of derivation ‘$drvPath’ is not available.") unless defined $logPath;
my $size = stat($logPath)->size;
error($c, "This build log is too big to display ($size bytes).")
if $size >= 64 * 1024 * 1024;
# Don't send logs that we can't stream.
my $size = stat($logPath)->size; # FIXME: not so meaningful for compressed logs
error($c, "This build log is too big to display ($size bytes).") unless
$mode eq "raw"
|| (($mode eq "tail" || $mode eq "tail-reload") && $logPath !~ /\.bz2$/)
|| $size < 64 * 1024 * 1024;
if (!$mode) {
# !!! quick hack
@ -150,12 +153,9 @@ sub showLog {
}
elsif ($mode eq "raw") {
if ($logPath !~ /.bz2$/) {
$c->serve_static_file($logPath);
} else {
$c->stash->{'plain'} = { data => (scalar logContents($logPath)) || " " };
$c->forward('Hydra::View::Plain');
}
$c->stash->{logPath} = $logPath;
$c->forward('Hydra::View::NixLog');
return;
}
elsif ($mode eq "tail-reload") {

4
src/lib/Hydra/Controller/Root.pm
View File

@ -352,8 +352,8 @@ sub log :Local :Args(1) {
my $logPath = findLog($c, $path, @outpaths);
notFound($c, "The build log of $path is not available.") unless defined $logPath;
$c->stash->{'plain'} = { data => (scalar logContents($logPath)) || " " };
$c->forward('Hydra::View::Plain');
$c->stash->{logPath} = $logPath;
$c->forward('Hydra::View::NixLog');
}