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

Remove the pretty-printed log

Browse Source 
It didn't work anymore due to the removal of nix-log2xml. And in any
case XSL is the work of the devil.
This commit is contained in:
Eelco Dolstra
2016-10-27 14:43:17 +02:00
parent 41a020e323
commit 2b790ceefa
11 changed files with 9 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,19 +155,14 @@ sub showLog {
|| $size < 64 * 1024 * 1024;
if ($mode eq "pretty") {
# !!! quick hack
my $pipeline = ($logPath =~ /.bz2$/ ? "bzip2 -d < $logPath" : "cat $logPath")
. " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"
. " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " -";
$c->stash->{template} = 'log.tt';
$c->stash->{logtext} = decode("utf-8", `ulimit -t 5 ; $pipeline`);
$c->stash->{logtext} = logContents($logPath);
}
elsif ($mode eq "raw") {
$c->stash->{logPath} = $logPath;
$c->stash->{finished} = $finished;
$c->forward('Hydra::View::NixLog');
return;
}
elsif ($mode eq "tail-reload") {