grahamc/hydra - Change NX5BM2OINIVVOHN23N2DWH5LHVQN7AVRWYPUZ5J54WXFWE5B5XIQC

Machine status page: Show disabled machines and some machine stats

Created by Eelco Dolstra on September 9, 2015

NX5BM2OINIVVOHN23N2DWH5LHVQN7AVRWYPUZ5J54WXFWE5B5XIQC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/lib/Hydra/Controller/Root.pm at line 12 [6.804]
[2.12]
[5.0]
```
use JSON;
```

Replacement in src/lib/Hydra/Controller/Root.pm at line 113 [6.804]

B:BD[7.32] → [7.32:61]

B:BD[7.61] → [4.0:38]

    ${$machines}{''} //= {};
    delete ${$machines}{'localhost'};

[7.32]

[8.0]

    $machines->{''} //= {};
    delete $machines->{'localhost'};
    my $status = $c->model('DB::SystemStatus')->find("queue-runner");
    if ($status) {
        my $ms = decode_json($status->status)->{"machines"};
        foreach my $name (keys %{$ms}) {
            $name = "" if $name eq "localhost";
            $machines->{$name} //= {disabled => 1};
            $machines->{$name}->{nrStepsDone} = $ms->{$name}->{nrStepsDone};
            $machines->{$name}->{avgStepBuildTime} = $ms->{$name}->{avgStepBuildTime} // 0;
        }
    }

Insertion in src/root/machine-status.tt at line 3 [9.8348]
[9.8411]
[9.9392]
```
[% USE format %]
```

Replacement in src/root/machine-status.tt at line 21 [9.8348]

∅:D[3.189] → [7.403:433]

B:BD[10.259] → [7.403:433]

          <tt>[% name %]</tt>

[3.189]

[11.192]

          <tt [% IF m.value.disabled %]style="text-decoration: line-through;"[% END %]>[% name %]</tt>

Replacement in src/root/machine-status.tt at line 23 [9.8348]

B:BD[11.231] → [11.231:371]

            ([% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END %]<tt>[% system %]</tt>[% END %])

[11.231]

[11.371]

            <span class="muted" style="font-weight: normal;">
              ([% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END %]<tt>[% system %]</tt>[% END %])
            </span>
          [% END %]
          [% IF m.value.nrStepsDone %]
            <span class="muted" style="font-weight: normal;">
              ([% m.value.nrStepsDone %] steps done, [% f = format("%.1f"); f(m.value.avgStepBuildTime) %] s/step)
            </span>