Fix showing build steps in the machine status page

[?]
Apr 23, 2013, 12:24 PM
J4R2VCPPXW6QPVIDNXVHFRTDAZAPLAFBBBPIQZLZVPUHFXCO67TAC

Dependencies

  • [2] HTL6HIBM machine-status: Read /etc/nix.machines instead of using the BuildMachines table
  • [3] PZL3SZM3 Give every page a consistent title
  • [4] SMCOU72F hydra: add some admin for adding/enabling/etc build machines
  • [5] BOAFFKUX Active build steps: Make the rows clickable
  • [6] V6S6OYIA Formatting tweaks
  • [7] EFWN7JBV * Added a status page that shows all the currently executing build steps.
  • [8] ZWCTAZGL added newsitems, added some admin options to clear various caches.
  • [9] FFEH62DE Machine status page now looks much better and more consistent with rest of Hydra

Change contents

  • edit in src/root/machine-status.tt at line 6
    [3.222]
    [3.9525]
    [% name = m.key ? m.key.match('@(.*)').0 : "localhost" %]
  • replacement in src/root/machine-status.tt at line 10
    [3.259][2.1400:1459]()
    [% IF m.value.maxJobs > 0 %]
    Running
    [3.259]
    [3.416]
    [% IF !m.key || m.value.maxJobs %]
    Enabled:
  • replacement in src/root/machine-status.tt at line 13
    [3.437][2.1460:1641]()
    Stopped
    [% END %] <tt>[% m.key %]</tt> (<tt>[% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END; system; END %])</tt>
    [3.437]
    [3.729]
    Disabled:
    [% END %] <tt>[% name %]</tt>
    [% IF m.value.systemTypes %]
    ([% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END %]<tt>[% system %]</tt>[% END %])
    [% END %]
  • replacement in src/root/machine-status.tt at line 24
    [3.811][2.1642:1698]()
    [% IF step.machine.match('@(.*)').0 == m.key %]
    [3.811]
    [3.812]
    [% name2 = step.machine ? step.machine.match('@(.*)').0 : "localhost" %]
    [% IF name == name2 %]
  • replacement in src/root/machine-status.tt at line 32
    [3.1215][3.1215:1316]()
    <td class='right'>[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
    [3.1215]
    [3.1316]
    <td style="width: 10em">[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
  • replacement in src/root/machine-status.tt at line 40
    [2.1863][2.1863:1915]()
    <tr><td colspan="5">Never built</td></tr>
    [2.1863]
    [2.1915]
    <tr><td colspan="5">Never used</td></tr>
  • edit in src/root/machine-status.tt at line 47
    [3.10946][3.10946:10948]()
  • replacement in src/root/status.tt at line 17
    [3.5271][3.5271:5368]()
    <td class='right'>[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>
    [3.5271]
    [3.5368]
    <td style="width: 10em">[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>