aboutsummaryrefslogtreecommitdiffstats
path: root/vespaclient
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2018-05-14 14:43:04 +0000
committerArne Juul <arnej@yahoo-inc.com>2018-05-14 14:43:25 +0000
commit4503c40245fab0105322110874d01fe379a6b274 (patch)
tree3ea5f886afbeaf1274002f19e905221e3a94adf3 /vespaclient
parenta9d9ef3dc96791185de550702876d49b1fef9557 (diff)
update perl bootstrap
Diffstat (limited to 'vespaclient')
-rwxr-xr-xvespaclient/src/perl/bin/GetClusterState.pl2
-rwxr-xr-xvespaclient/src/perl/bin/GetNodeState.pl2
-rwxr-xr-xvespaclient/src/perl/bin/SetNodeState.pl2
3 files changed, 6 insertions, 0 deletions
diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl
index e3528fff039..155db87f34e 100755
--- a/vespaclient/src/perl/bin/GetClusterState.pl
+++ b/vespaclient/src/perl/bin/GetClusterState.pl
@@ -57,9 +57,11 @@ sub findhost {
my $tmp = $ENV{'VESPA_HOSTNAME'};
if (!defined $tmp) {
$tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+ chomp $tmp;
}
system("vespa-validate-hostname $tmp");
( $? == 0 ) or die "Could not validate hostname\n";
+ return $tmp;
}
BEGIN {
diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl
index 28f3cf99b1f..1e048df4b40 100755
--- a/vespaclient/src/perl/bin/GetNodeState.pl
+++ b/vespaclient/src/perl/bin/GetNodeState.pl
@@ -57,9 +57,11 @@ sub findhost {
my $tmp = $ENV{'VESPA_HOSTNAME'};
if (!defined $tmp) {
$tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+ chomp $tmp;
}
system("vespa-validate-hostname $tmp");
( $? == 0 ) or die "Could not validate hostname\n";
+ return $tmp;
}
BEGIN {
diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl
index 91ceeea2c1b..77ebf9a2456 100755
--- a/vespaclient/src/perl/bin/SetNodeState.pl
+++ b/vespaclient/src/perl/bin/SetNodeState.pl
@@ -57,9 +57,11 @@ sub findhost {
my $tmp = $ENV{'VESPA_HOSTNAME'};
if (!defined $tmp) {
$tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+ chomp $tmp;
}
system("vespa-validate-hostname $tmp");
( $? == 0 ) or die "Could not validate hostname\n";
+ return $tmp;
}
BEGIN {