add head ref to daskboard, requested by Stepehen Frost.

[buildfarm-server.git] / templates / log.tt

diff --git a/templates/log.tt b/templates/log.tt
index 43b89c413ce734394de7a2c3123916789b4d3fc6..29d51e8344ade531c9d56adceaeab4edaf98d18a 100644 (file)
--- a/templates/log.tt
+++ b/templates/log.tt
@@ -7,7 +7,7 @@ See accompanying License file for license details
 -%]
 [% PERL %]
        use POSIX qw(ceil);
 -%]
 [% PERL %]
        use POSIX qw(ceil);

-        my $lrfactor = 6;
+        my $lrfactor = 4;

        $stash->set(lrfactor => $lrfactor);
         my $rows = $stash->get('log_file_names'); 
        my $logrows = ceil(scalar(@$rows)/$lrfactor);
        $stash->set(lrfactor => $lrfactor);
         my $rows = $stash->get('log_file_names'); 
        my $logrows = ceil(scalar(@$rows)/$lrfactor);


@@ -69,10 +69,10 @@ See accompanying License file for license details
 [% END %]
 [% cell = 0; FOREACH logstage  IN log_file_names ; striplog = logstage.replace('\.log$','') ; cell = loop.count %]
   [% IF loop.first %] 
 [% END %]
 [% cell = 0; FOREACH logstage  IN log_file_names ; striplog = logstage.replace('\.log$','') ; cell = loop.count %]
   [% IF loop.first %] 

-    <br /> <table><tr><th class='head' rowspan='[% logrows %]'>Stage Logs</th>
+    <br /> <table><tr><th class='head' rowspan='[% logrows %]'>Stage Logs<br /><br />Total run time<br />[% run_time %]</th>

   [% END %]
     [% IF loop.count > 1 and loop.count % lrfactor == 1 %]<tr>[% END %]
   [% END %]
     [% IF loop.count > 1 and loop.count % lrfactor == 1 %]<tr>[% END %]

-    <td><a href='show_stage_log.pl?nm=[% system %]&amp;dt=[% urldt | uri %]&amp;stg=[% striplog %]'>[% striplog %]</a></td>
+    <td><a href='show_stage_log.pl?nm=[% system %]&amp;dt=[% urldt | uri %]&amp;stg=[% striplog %]'>[% striplog %]</a> ([% stage_times.$logstage.stage_duration %])</td>

     [% IF loop.count % lrfactor == 0 %]</tr>[% END %]
 [% END %]
 
     [% IF loop.count % lrfactor == 0 %]</tr>[% END %]
 [% END %]
 


@@ -104,8 +104,9 @@ See accompanying License file for license details
 [% IF changed_this_run_logs.0 %]
 <h5>Git log</h5>
 <pre>
 [% IF changed_this_run_logs.0 %]
 <h5>Git log</h5>
 <pre>

+[% IF last_build_git_ref && git_head_ref %]

 <a href="https://github.com/postgres/postgres/compare/[% last_build_git_ref %]...[% git_head_ref %]">Change Set for this build</a>
 <a href="https://github.com/postgres/postgres/compare/[% last_build_git_ref %]...[% git_head_ref %]">Change Set for this build</a>

-
+[% END %]

 [% FOREACH clog IN changed_this_run_logs ; PROCESS gitlog -%]
 [%- END -%]
 </pre>
 [% FOREACH clog IN changed_this_run_logs ; PROCESS gitlog -%]
 [%- END -%]
 </pre>