Author: rob
Date: Wed Feb 2 09:00:52 2011
New Revision: 25746
URL: https://svn.nixos.org/websvn/nix/?rev=25746&sc=1
Log:
automatic reload of tail log when build is running
Modified:
hydra/trunk/src/lib/Hydra/Controller/Build.pm
hydra/trunk/src/root/build.tt
hydra/trunk/src/root/static/css/hydra.css
Modified: hydra/trunk/src/lib/Hydra/Controller/Build.pm
==============================================================================
--- hydra/trunk/src/lib/Hydra/Controller/Build.pm Wed Feb 2 07:11:18
2011 (r25745)
+++ hydra/trunk/src/lib/Hydra/Controller/Build.pm Wed Feb 2 09:00:52
2011 (r25746)
@@ -127,6 +127,16 @@
$c->forward('Hydra::View::Plain');
}
+ elsif ($mode eq "tail-reload") {
+ my $url = $c->request->uri->as_string;
+ $url =~ s/tail-reload/tail/g;
+ $c->stash->{url} = $url;
+ $c->stash->{reload} = defined $c->stash->{build}->schedulingInfo &&
$c->stash->{build}->schedulingInfo->busy;
+ $c->stash->{title} = "";
+ $c->stash->{contents} = (scalar `$pipestart | tail -n 50`) || " ";
+ $c->stash->{template} = 'plain-reload.tt';
+ }
+
elsif ($mode eq "tail") {
$c->stash->{'plain'} = { data => (scalar `$pipestart | tail -n 50`) ||
" " };
$c->forward('Hydra::View::Plain');
Modified: hydra/trunk/src/root/build.tt
==============================================================================
--- hydra/trunk/src/root/build.tt Wed Feb 2 07:11:18 2011 (r25745)
+++ hydra/trunk/src/root/build.tt Wed Feb 2 09:00:52 2011 (r25746)
@@ -54,7 +54,7 @@
<span class="error">Failed: [%
HTML.escape(step.errormsg) %]</span>
[% END %]
[% IF step.logfile %]
- (<a href="[% log %]">log</a>, <a href="[%
"$log/raw" %]">raw</a>, <a href="[% "$log/tail" %]">tail</a>)
+ (<a href="[% log %]">log</a>, <a href="[%
"$log/raw" %]">raw</a>, <a href="[% "$log/tail-reload" %]">tail</a>)
[% END %]
</td>
</tr>
@@ -143,7 +143,7 @@
<td>
<a href="[% c.uri_for('/build'
build.id 'log') %]"><strong>Available</strong></a>
(<a href="[% c.uri_for('/build'
build.id 'log' 'raw') %]">raw</a>,
- <a href="[% c.uri_for('/build'
build.id 'log' 'tail') %]">tail</a>)
+ <a href="[% c.uri_for('/build'
build.id 'log' 'tail-reload') %]">tail</a>)
</td>
</tr>
[% END %]
@@ -351,7 +351,7 @@
<td>
<a href="[% c.uri_for('/build' build.id 'log')
%]"><strong>Available</strong></a>
(<a href="[% c.uri_for('/build' build.id 'log' 'raw')
%]">raw</a>,
- <a href="[% c.uri_for('/build' build.id 'log'
'tail') %]">tail</a>)
+ <a href="[% c.uri_for('/build' build.id 'log'
'tail-reload') %]">tail</a>)
</td>
</tr>
[% END %]
Modified: hydra/trunk/src/root/static/css/hydra.css
==============================================================================
--- hydra/trunk/src/root/static/css/hydra.css Wed Feb 2 07:11:18 2011
(r25745)
+++ hydra/trunk/src/root/static/css/hydra.css Wed Feb 2 09:00:52 2011
(r25746)
@@ -141,9 +141,11 @@
}
pre.buildlog {
- border: 1px solid black;
+ border: 3px solid darkblue;
padding: 0.3em;
white-space: pre-wrap;
+ background: black;
+ color: #ffffff;
}
div.buildlog {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
