snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Handle SSH hosts without a @

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-17 13:49:18 +02:00
parent 745efce828
commit c6d504edbb
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lib/Hydra/View/TT.pm
View file

@ -9,7 +9,7 @@ __PACKAGE__->config(
ENCODING => 'utf-8', ENCODING => 'utf-8',
PRE_CHOMP => 1, PRE_CHOMP => 1,
POST_CHOMP => 1, POST_CHOMP => 1,
expose_methods => [qw/buildLogExists buildStepLogExists jobExists/]); expose_methods => [qw/buildLogExists buildStepLogExists jobExists stripSSHUser/]);
sub buildLogExists { sub buildLogExists {
my ($self, $c, $build) = @_; my ($self, $c, $build) = @_;
@ -23,6 +23,16 @@ sub buildStepLogExists {
return defined findLog($c, $step->drvpath, @outPaths); return defined findLog($c, $step->drvpath, @outPaths);
} }
sub stripSSHUser {
my ($self, $c, $name) = @_;
if ($name =~ /^.*@(.*)$/) {
return $1;
} else {
return $name;
}
}
# Check whether the given job is a member of the most recent jobset # Check whether the given job is a member of the most recent jobset
# evaluation. # evaluation.
sub jobExists { sub jobExists {

4
src/root/machine-status.tt
View file

@ -13,7 +13,7 @@
</tr> </tr>
</thead> </thead>
[% FOREACH m IN machines %] [% FOREACH m IN machines %]
[% name = m.key ? m.key.match('@(.*)').0 : "localhost" %] [% name = m.key ? stripSSHUser(m.key) : "localhost" %]
<thead> <thead>
<tr> <tr>
<th colspan="6"> <th colspan="6">
@ -27,7 +27,7 @@
<tbody> <tbody>
[% idle = 1 %] [% idle = 1 %]
[% FOREACH step IN steps %] [% FOREACH step IN steps %]
[% name2 = step.machine ? step.machine.match('@(.*)').0 : "localhost" %] [% name2 = step.machine ? stripSSHUser(step.machine) : "localhost" %]
[% IF name == name2 %] [% IF name == name2 %]
[% idle = 0 %] [% idle = 0 %]
<tr> <tr>