Merge pull request #3370 from vespa-engine/arnej/find-hostname-in-defaults-module

Arnej/find hostname in defaults module

4 files changed, 10 insertions, 17 deletions

diff --git a/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl
index cc0daed3e7d..d54d7af4418 100755
--- a/config/src/apps/vespa-config/vespa-config.pl
+++ b/config/src/apps/vespa-config/vespa-config.pl
@@ -72,6 +72,8 @@ use warnings;
 use File::Copy;
 use File::Temp;
 
+my $myHostname = `vespa-print-default hostname`;
+chomp $myHostname;
 my $default_configproxy_port = "19090";
 my $default_configserver_port = "19070";
 my $zk_client_port;
@@ -155,10 +157,7 @@ sub printConfigServerPort {
 sub getConfigServers {
     my @ret;
 
-    my $hostname = `hostname`;
-    chomp $hostname;
-
-    my $addr = getVar('addr_configserver', $hostname, 1);
+    my $addr = getVar('addr_configserver', $myHostname, 1);
     my $port = getVar('port_configserver_rpc', $default_configserver_port, 0);
 
     my $h;
@@ -253,9 +252,7 @@ sub makeFiledistributorDistributorConfig {
     my $cfgFile = $VESPA_HOME . "/conf/filedistributor/filedistributor.cfg";
     open(CFG, "> ${cfgFile}.new") or die "Cannot write to '${cfgFile}.new'";
     print CFG "torrentport 19093\n";
-    my $hostname = `hostname`;
-    chomp $hostname;
-    print CFG "hostname \"$hostname\"\n";
+    print CFG "hostname \"$myHostname\"\n";
     print CFG "filedbpath \"$VESPA_HOME" . "/var/db/vespa/filedistribution\"\n";
     print CFG "maxdownloadspeed 0\n";
     print CFG "maxuploadspeed 0\n";
@@ -268,9 +265,7 @@ sub makeFiledistributorDistributorConfig {
 sub makeFiledistributorRpcConfig {
     my $cfgFile = $VESPA_HOME . "/conf/filedistributor/filedistributorrpc.cfg";
     open(CFG, "> ${cfgFile}.new") or die "Cannot write to '${cfgFile}.new'";
-    my $hostname = `hostname`;
-    chomp $hostname;
-    print CFG "connectionspec \"tcp/$hostname:19092\"\n";
+    print CFG "connectionspec \"tcp/$myHostname:19092\"\n";
     close(CFG);
     rename("${cfgFile}.new", ${cfgFile})
         or die "Cannot rename '${cfgFile}.new' -> '${cfgFile}': $!\n";
@@ -294,8 +289,6 @@ sub makeFiledistributorConfig {
 }
 
 sub isThisAConfigServer {
-    my $hostnameForThisHost = `hostname`;
-    chomp $hostnameForThisHost;
     my $addr;
     foreach $addr (getConfigServers()) {
         my $host = "";
@@ -303,7 +296,7 @@ sub isThisAConfigServer {
         if ($addr =~ /(.*):(\d+)$/) {
             $host = $1;
         }
-        if ($hostnameForThisHost eq $host or $host eq "localhost") {
+        if ($myHostname eq $host or $host eq "localhost") {
           print "yes\n";
           exit 0;
         }
diff --git a/config/src/apps/vespa-configproxy-cmd/main.cpp b/config/src/apps/vespa-configproxy-cmd/main.cpp
index 16ab5e50710..63fa1285bb2 100644
--- a/config/src/apps/vespa-configproxy-cmd/main.cpp
+++ b/config/src/apps/vespa-configproxy-cmd/main.cpp
@@ -28,7 +28,7 @@ Application::parseOpts()
             _flags.method = optArg;
             break;
         case 's':
-            _flags.hostname = optArg;
+            _flags.targethost = optArg;
             break;
         case 'p':
             _flags.portnumber = atoi(optArg);
diff --git a/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp b/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
index fb60f9c223c..3407a880ec7 100644
--- a/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
+++ b/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
@@ -13,7 +13,7 @@ Flags & Flags::operator=(const Flags &) = default;
 Flags::Flags()
     : method("cache"),
       args(),
-      hostname("localhost"),
+      targethost("localhost"),
       portnumber(19090)
 { }
 Flags::~Flags() { }
@@ -62,7 +62,7 @@ void ProxyCmd::printArray(FRT_Values *rvals) {
 }
 
 vespalib::string ProxyCmd::makeSpec() {
-    return vespalib::make_string("tcp/%s:%d", _flags.hostname.c_str(), _flags.portnumber);
+    return vespalib::make_string("tcp/%s:%d", _flags.targethost.c_str(), _flags.portnumber);
 }
 
 void ProxyCmd::autoPrint() {
diff --git a/config/src/apps/vespa-configproxy-cmd/proxycmd.h b/config/src/apps/vespa-configproxy-cmd/proxycmd.h
index fca5903dc79..df8f429a3c9 100644
--- a/config/src/apps/vespa-configproxy-cmd/proxycmd.h
+++ b/config/src/apps/vespa-configproxy-cmd/proxycmd.h
@@ -12,7 +12,7 @@ class FRT_Values;
 struct Flags {
     vespalib::string method;
     std::vector<vespalib::string> args;
-    vespalib::string hostname;
+    vespalib::string targethost;
     int portnumber;
     Flags(const Flags &);
     Flags & operator=(const Flags &);