summaryrefslogtreecommitdiffstats
path: root/clustercontroller-core
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-09-29 16:36:21 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-09-29 16:36:21 +0200
commitb4656dc85fe215bf79eadedd868be0082fe70ab0 (patch)
treea3e11af2608694114a7fd5288748c7b2508e20d0 /clustercontroller-core
parent59f27953f5c8cd144f31f45a82d88d21511b8e6a (diff)
Yahoo sets up mac wireless networks such that the local hostname points to an
ip which does not resolve. This works around that problem by finding a resolvable address (while still falling back to localhost if we only get ipv6 addresses, as that causes other problems in docker containers).
Diffstat (limited to 'clustercontroller-core')
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
index 46fb18180e5..9619a15de3c 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
@@ -100,8 +100,7 @@ public class RpcServer {
register = new Register(supervisor, slist,
new Spec(InetAddress.getLocalHost().getHostName(), acceptor.port()), slobrokBackOffPolicy);
} else {
- register = new Register(supervisor, slist,
- InetAddress.getLocalHost().getHostName(), acceptor.port());
+ register = new Register(supervisor, slist, InetAddress.getLocalHost().getHostName(), acceptor.port());
}
register.registerName(getSlobrokName());
}