diff options
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java | 33 | ||||
-rw-r--r-- | vespalog/src/main/java/com/yahoo/log/Util.java | 23 |
2 files changed, 5 insertions, 51 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java index e60c058f578..092c2361156 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java @@ -1,17 +1,14 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.core; +import com.yahoo.net.HostName; import org.osgi.service.log.LogEntry; import org.osgi.service.log.LogListener; -import java.io.File; -import java.io.IOException; import java.io.PrintStream; -import java.lang.management.ManagementFactory; -import com.yahoo.net.HostName; /** - * @author <a href="mailto:vikasp@yahoo-inc.com">Vikas Panwar</a> + * @author Vikas Panwar */ class ConsoleLogListener implements LogListener { @@ -71,31 +68,7 @@ class ConsoleLogListener implements LogListener { } static String getProcessId() { - // platform independent - String jvmName = ManagementFactory.getRuntimeMXBean().getName(); - if (jvmName != null) { - int idx = jvmName.indexOf('@'); - if (idx > 0) { - try { - return Long.toString(Long.valueOf(jvmName.substring(0, jvmName.indexOf('@')))); - } catch (NumberFormatException e) { - // fall through - } - } - } - - // linux specific - File file = new File("/proc/self"); - if (file.exists()) { - try { - return file.getCanonicalFile().getName(); - } catch (IOException e) { - return null; - } - } - - // fallback - return null; + return Long.toString(ProcessHandle.current().pid()); } static String getHostname() { diff --git a/vespalog/src/main/java/com/yahoo/log/Util.java b/vespalog/src/main/java/com/yahoo/log/Util.java index ec691fe4ac4..776d13c1186 100644 --- a/vespalog/src/main/java/com/yahoo/log/Util.java +++ b/vespalog/src/main/java/com/yahoo/log/Util.java @@ -2,13 +2,12 @@ package com.yahoo.log; import static com.yahoo.vespa.defaults.Defaults.getDefaults; -import java.io.BufferedReader; -import java.io.InputStreamReader; /** * * @author Bjorn Borud * @author arnej27959 + * @author bjorncs * */ public class Util { @@ -17,26 +16,8 @@ public class Util { return getDefaults().vespaHostname(); } - /** - * Emulate the getpid() system call - **/ public static String getPID() { - try { - Process p = Runtime.getRuntime().exec( - new String[] {"perl", "-e", "print getppid().\"\\n\";"} - ); - BufferedReader r = new BufferedReader( - new InputStreamReader(p.getInputStream(), "UTF-8")); - String line = r.readLine(); - p.destroy(); - int pid = Integer.parseInt(line); - if (pid > 0) { - return Integer.toString(pid); - } - } catch(Exception e) { - // any problem handled by return below - } - return "-"; + return Long.toString(ProcessHandle.current().pid()); } } |