diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2017-12-21 10:40:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-21 10:40:38 +0100 |
commit | 16c6588ce1f8671d01b354b84345a1a951e216ff (patch) | |
tree | 54c97e359a4139993a31f1c53b2177b4137cfcf0 /vespajlib/src/main/java/com/yahoo/net/HostName.java | |
parent | 55a4ef7c74d4f9ea996af2e3e6be23e7c5eb8fe7 (diff) | |
parent | c3bffeef3300e1544c1f8c7504a9544872435d79 (diff) |
Merge pull request #4505 from vespa-engine/hakonhall/allow-localhost-zk-affinity
Allow localhost zk affinity
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/net/HostName.java')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/net/HostName.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/net/HostName.java b/vespajlib/src/main/java/com/yahoo/net/HostName.java index 37f7fe80246..157239e456f 100644 --- a/vespajlib/src/main/java/com/yahoo/net/HostName.java +++ b/vespajlib/src/main/java/com/yahoo/net/HostName.java @@ -27,7 +27,7 @@ public class HostName { private static final Logger logger = Logger.getLogger(HostName.class.getName()); - private static String cachedHostName = null; + private static String preferredHostName = null; /** * Return a public and fully qualified hostname for localhost that resolves to an IP address on @@ -38,14 +38,14 @@ public class HostName { * @throws RuntimeException if accessing the network or the 'hostname' command fails */ public static synchronized String getLocalhost() { - if (cachedHostName == null) { + if (preferredHostName == null) { try { - cachedHostName = getPreferredHostName(); + preferredHostName = getPreferredHostName(); } catch (Exception e) { throw new RuntimeException("Failed to find a preferred hostname", e); } } - return cachedHostName; + return preferredHostName; } private static String getPreferredHostName() throws Exception { @@ -178,4 +178,7 @@ public class HostName { } } + public static void setHostNameForTestingOnly(String hostName) { + preferredHostName = hostName; + } } |