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

Fix UTF-8 handling of log files

Browse Source
This commit is contained in:
Eelco Dolstra
2014-08-13 18:53:29 +02:00
parent a2b27c7cf2
commit 42b23133e8
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ use Data::Dump qw(dump);
use Nix::Store;
use Nix::Config;
use List::MoreUtils qw(all);
use Encode;
sub buildChain :Chained('/') :PathPart('build') :CaptureArgs(1) {
@ -141,9 +142,9 @@ sub showLog {
# !!! 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") . " - | tail -n +2";
. " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " -";
$c->stash->{template} = 'log.tt';
$c->stash->{logtext} = `ulimit -t 5 ; $pipeline`;
$c->stash->{logtext} = decode("utf-8", `ulimit -t 5 ; $pipeline`);
}
elsif ($mode eq "raw") {

3
src/lib/Hydra/Helper/Nix.pm
View File

@ -8,6 +8,7 @@ use Config::General;
use Hydra::Helper::CatalystUtils;
use Hydra::Model::DB;
use Nix::Store;
use Encode;
our @ISA = qw(Exporter);
our @EXPORT = qw(
@ -310,7 +311,7 @@ sub logContents {
else {
$cmd = defined $tail ? "tail -$tail $logPath" : "cat $logPath";
}
return `$cmd`;
return decode("utf-8", `$cmd`);
}