diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2017-09-08 07:44:54 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2017-09-08 07:44:54 +0000 |
commit | 7e11447015f88a0a627ae5aec534d59271f5f234 (patch) | |
tree | 68d94491b83dbd44e5af6704b42d42d2a371b293 /vespalog | |
parent | d0339c87070c88aa97ddb44d6e29ba4d0a95ed29 (diff) |
use Defaults.vespaHostname
Diffstat (limited to 'vespalog')
-rw-r--r-- | vespalog/pom.xml | 5 | ||||
-rw-r--r-- | vespalog/src/main/java/com/yahoo/log/Util.java | 23 |
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(); } /** |