diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-13 14:41:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-13 14:41:29 +0200 |
commit | e2b7c6ed50d94e83e2fc00c8716fcc68ad2a9fbb (patch) | |
tree | 3e1cc457bf093bfe4017212e830db11266be3431 | |
parent | 720f1bf1b5e7302f3e2b9f47b8dc4b0629e9d42c (diff) | |
parent | fffbe536ae5a7a5b3b74df8e845c569eef28db46 (diff) |
Merge pull request #7297 from vespa-engine/bratseth/use-processexecuter
Use ProcessExecuter
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java index 33896c870a5..8bb072b5a64 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java @@ -5,6 +5,7 @@ import com.yahoo.concurrent.ThreadFactoryFactory; import com.yahoo.container.core.AccessLogConfig; import com.yahoo.io.NativeIO; import com.yahoo.log.LogFileDb; +import com.yahoo.system.ProcessExecuter; import java.io.File; import java.io.FileInputStream; @@ -25,7 +26,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; - /** * <p>Implements log file naming/rotating logic for container logs.</p> * @@ -308,11 +308,9 @@ public class LogFileHandler extends StreamHandler { } String [] cmd = new String[]{"/bin/ln", "-sf", canonicalPath, f2.getPath()}; try { - Runtime r = Runtime.getRuntime(); - Process p = r.exec(cmd); + int retval = new ProcessExecuter().exec(cmd).getFirst(); // Detonator pattern: Think of all the fun we can have if ln isn't what we // think it is, if it doesn't return, etc, etc - int retval = p.waitFor(); if (retval != 0) { logger.warning("Command '" + Arrays.toString(cmd) + "' + failed with exitcode=" + retval); } |