Remove the pretty-printed log

It didn't work anymore due to the removal of nix-log2xml. And in any case XSL is the work of the devil.
helsinki-systems · Oct 27, 2016 · 2b790ce · 2b790ce
1 parent 41a020e
commit 2b790ce
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 183 deletions.
diff --git a/configure.ac b/configure.ac
@@ -74,7 +74,6 @@ AC_CONFIG_FILES([
   src/hydra-eval-jobs/Makefile
   src/hydra-queue-runner/Makefile
   src/sql/Makefile
-  src/xsl/Makefile
   src/ttf/Makefile
   src/lib/Makefile
   src/root/Makefile

diff --git a/release.nix b/release.nix
@@ -135,7 +135,7 @@ rec {
         ];
 
       hydraPath = lib.makeBinPath (
-        [ libxslt sqlite subversion openssh nix coreutils findutils pixz
+        [ sqlite subversion openssh nix coreutils findutils pixz
           gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
         ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = hydra-evaluator hydra-eval-jobs hydra-queue-runner sql script lib root xsl ttf
+SUBDIRS = hydra-evaluator hydra-eval-jobs hydra-queue-runner sql script lib root ttf
 BOOTCLEAN_SUBDIRS = $(SUBDIRS)
 DIST_SUBDIRS      = $(SUBDIRS)
diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
@@ -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") {

diff --git a/src/root/log.tt b/src/root/log.tt
@@ -8,10 +8,8 @@
   [% END %]
 </p>
 
-<hr />
-
-<div class="buildlog">
-[% logtext %]
-</div>
+<pre class="taillog" id="contents">
+[% HTML.escape(logtext) %]
+</pre>
 
 [% END %]
diff --git a/src/root/plain-reload.tt b/src/root/plain-reload.tt
@@ -1,11 +1,11 @@
-[% WRAPPER layout.tt title=title %]
+[% WRAPPER layout.tt title="Log of " _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job $build.project.name:$build.jobset.name:$build.job.name" %]
 [% PROCESS common.tt %]
 
 [% project = build.project %]
 [% jobset = build.jobset %]
 [% job = build.job %]
 
-<h2>Last 50 log lines of [% INCLUDE renderFullJobNameOfBuild %] build <a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a>[%IF step %] step [% step.stepnr %][% END %]</h2>
+<p>Below are the last 50 log lines. The <a href="[% c.uri_for('/build' build.id 'log') %]">full log</a> is also available.</p>
 
 [% IF reload %]
 <script>

diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
@@ -119,10 +119,8 @@ span.keep-whitespace {
     max-width: none; /* don't apply responsive design to status images */
 }
 
-pre.taillog {
+pre.log, pre.taillog {
     line-height: 1.2em;
-    max-height: 60em;
-    overflow: hidden;
 }
 
 div.flot-tooltip {

diff --git a/src/root/static/css/logfile.css b/src/root/static/css/logfile.css
diff --git a/src/xsl/Makefile.am b/src/xsl/Makefile.am
diff --git a/src/xsl/log2html.xsl b/src/xsl/log2html.xsl
diff --git a/src/xsl/mark-errors.xsl b/src/xsl/mark-errors.xsl