Author: rob
Date: Fri Jun 10 09:53:15 2011
New Revision: 27412
URL: https://svn.nixos.org/websvn/nix/?rev=27412&sc=1
Log:
remove ascii escapes from log in tail page and emails
Modified:
hydra/trunk/src/lib/Hydra/Controller/Build.pm
hydra/trunk/src/lib/Hydra/Helper/Nix.pm
hydra/trunk/src/script/hydra_build.pl.in
Modified: hydra/trunk/src/lib/Hydra/Controller/Build.pm
==============================================================================
--- hydra/trunk/src/lib/Hydra/Controller/Build.pm Fri Jun 10 07:36:30
2011 (r27411)
+++ hydra/trunk/src/lib/Hydra/Controller/Build.pm Fri Jun 10 09:53:15
2011 (r27412)
@@ -55,7 +55,7 @@
(my $lastBuildStep) = $build->buildsteps->search({},{order_by => "stepnr
DESC", rows => 1});
my $path = defined $lastBuildStep ? $lastBuildStep->logfile : "" ;
if (defined $build->resultInfo && ($build->resultInfo->buildstatus == 1 ||
$build->resultInfo->buildstatus == 6) && !($path eq "") && -f
$lastBuildStep->logfile) {
- $c->stash->{logtext} = `tail -n 50 $path`;
+ $c->stash->{logtext} = removeAsciiEscapes(`tail -n 50 $path`);
}
if($build->finished) {
Modified: hydra/trunk/src/lib/Hydra/Helper/Nix.pm
==============================================================================
--- hydra/trunk/src/lib/Hydra/Helper/Nix.pm Fri Jun 10 07:36:30 2011
(r27411)
+++ hydra/trunk/src/lib/Hydra/Helper/Nix.pm Fri Jun 10 09:53:15 2011
(r27412)
@@ -14,7 +14,7 @@
registerRoot getGCRootsDir gcRootFor
getPrimaryBuildsForView
getPrimaryBuildTotal
- getViewResult getLatestSuccessfulViewResult jobsetOverview);
+ getViewResult getLatestSuccessfulViewResult jobsetOverview
removeAsciiEscapes);
sub isValidPath {
@@ -259,5 +259,10 @@
return undef;
}
+sub removeAsciiEscapes {
+ my ($logtext) = @_;
+ $logtext =~ s/\e\[[A-Za-z]//g;
+ return $logtext;
+}
1;
Modified: hydra/trunk/src/script/hydra_build.pl.in
==============================================================================
--- hydra/trunk/src/script/hydra_build.pl.in Fri Jun 10 07:36:30 2011
(r27411)
+++ hydra/trunk/src/script/hydra_build.pl.in Fri Jun 10 09:53:15 2011
(r27412)
@@ -156,7 +156,7 @@
my $loglines = 50;
my $logfile = $build->resultInfo->logfile;
- my $logtext = defined $logfile && -e $logfile ? `tail -$loglines $logfile`
: "No logfile available.\n";
+ my $logtext = defined $logfile && -e $logfile ? removeAsciiEscapes(`tail
-$loglines $logfile`) : "No logfile available.\n";
my $body = "Hi,\n"
. "\n"
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
