use Defaults.vespaHostname

2 files changed, 7 insertions, 21 deletions

diff --git a/vespalog/pom.xml b/vespalog/pom.xml
index d300c4c56a2..6cea5ab83d9 100644
--- a/vespalog/pom.xml
+++ b/vespalog/pom.xml
@@ -29,6 +29,11 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
+      <artifactId>defaults</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
       <artifactId>annotations</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/vespalog/src/main/java/com/yahoo/log/Util.java b/vespalog/src/main/java/com/yahoo/log/Util.java
index 43e2a2dd321..6259e37f908 100644
--- a/vespalog/src/main/java/com/yahoo/log/Util.java
+++ b/vespalog/src/main/java/com/yahoo/log/Util.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.log;
 
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.InetAddress;
@@ -13,28 +14,8 @@ import java.net.InetAddress;
  */
 public class Util {
 
-    /**
-     * We do not have direct access to the <code>gethostname</code>
-     * system call, so we have to fake it.
-     */
     public static String getHostName () {
-        String hostname = "-";
-        try {
-            Process p = Runtime.getRuntime().exec("hostname");
-            BufferedReader r = new BufferedReader(
-                    new InputStreamReader(p.getInputStream(), "UTF-8"));
-            hostname = r.readLine();
-            if (hostname != null) {
-                return hostname;
-            }
-        }
-        catch (java.io.IOException e) {}
-        try {
-            hostname = InetAddress.getLocalHost().getHostName();
-            return hostname;
-        }
-        catch (java.net.UnknownHostException e) {}
-        return "-";
+        return getDefaults().vespaHostname();
     }
 
     /**