summaryrefslogtreecommitdiffstats
path: root/vespaclient
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2016-07-07 14:54:43 +0200
committerArne H Juul <arnej@yahoo-inc.com>2016-07-07 14:54:43 +0200
commite3ebca69864710324861154842457e3702ab23eb (patch)
tree977efd9d19015815d5176eb89e7f02531ae945e4 /vespaclient
parentb302d8385c6b3f93a2173d8a3823dabde27892ef (diff)
use new simpler way to get configserver and port
Diffstat (limited to 'vespaclient')
-rw-r--r--vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm14
1 files changed, 6 insertions, 8 deletions
diff --git a/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm b/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm
index 9e1fd90eeb3..a489f698cad 100644
--- a/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm
+++ b/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm
@@ -168,19 +168,17 @@ sub retrieveModelConfigDefault { # ()
$cmd .= " -w $CONFIG_REQUEST_TIMEOUT";
}
- my $temp = `${VESPA_HOME}/libexec/vespa/vespa-config.pl -configsources`;
- my @configSources = split(",", $temp);
- my $firstConfigSource = $configSources[0];
if (!defined $CONFIG_SERVER_HOST) {
- my @temp = split('/', $firstConfigSource);
- my @configHost = split(':', $temp[1]);
- $CONFIG_SERVER_HOST = $configHost[0];
+ my $temp = `${VESPA_HOME}/bin/print-vespa-default configservers`;
+ my @configServerHosts = split(' ', $temp);
+ $CONFIG_SERVER_HOST = $configServerHosts[0];
}
$cmd .= " -s $CONFIG_SERVER_HOST";
if (!defined $CONFIG_SERVER_PORT) {
- my @configPort = split(':', $firstConfigSource);
- $CONFIG_SERVER_PORT = $configPort[1];
+ my $temp = `${VESPA_HOME}/bin/print-vespa-default configserver_rpc_port`;
+ chomp($temp);
+ $CONFIG_SERVER_PORT = $temp;
}
$cmd .= " -p $CONFIG_SERVER_PORT";