diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-09-26 15:07:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-26 15:07:13 +0200 |
commit | 460170b69c8481db0e525196f22db00c3748e7f8 (patch) | |
tree | 43e1d273c7ec549747c9ea806d1d55c719c99876 /container-accesslogging | |
parent | 597ca76803b8c83594c7214184b02ec974488319 (diff) |
Revert "Balder/add native fadvise"
Diffstat (limited to 'container-accesslogging')
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java | 20 |
1 files changed, 3 insertions, 17 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 9963429bf97..d729b092670 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 @@ -2,7 +2,6 @@ package com.yahoo.container.logging; import com.yahoo.container.core.AccessLogConfig; -import com.yahoo.io.NativeIO; import com.yahoo.log.LogFileDb; import java.io.File; @@ -264,28 +263,15 @@ public class LogFileHandler extends StreamHandler { numberOfRecords = 0; lastRotationTime = now; nextRotationTime = 0; //figure it out later (lazy evaluation) - if ((oldFileName != null)) { - if (compressOnRotation) { - triggerCompression(oldFileName); - } else { - NativeIO nativeIO = new NativeIO(); - nativeIO.dropFileFromCache(new File(oldFileName)); - } + if (compressOnRotation && (oldFileName != null)) { + triggerCompression(oldFileName); } } private void triggerCompression(String oldFileName) { try { - String gzippedFileName = oldFileName + ".gz"; Runtime r = Runtime.getRuntime(); - StringBuilder cmd = new StringBuilder("gzip"); - cmd.append(" < "). append(oldFileName).append(" > ").append(gzippedFileName); - Process p = r.exec(cmd.toString()); - NativeIO nativeIO = new NativeIO(); - File oldFile = new File(oldFileName); - nativeIO.dropFileFromCache(oldFile); // Drop from cache in case somebody else has a reference to it preventing from dying quickly. - oldFile.delete(); - nativeIO.dropFileFromCache(new File(gzippedFileName)); + Process p = r.exec(new String[] { "gzip", oldFileName }); // Detonator pattern: Think of all the fun we can have if gzip isn't what we // think it is, if it doesn't return, etc, etc } catch (IOException e) { |