diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-26 12:30:44 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-26 12:30:44 +0200 |
commit | 9af0fd0f7f0941a6524d6b03a0891c13d6ebfe06 (patch) | |
tree | 3e55f917c1ad800e0efdfa82375abe1c167578ae /container-accesslogging | |
parent | 115a99c2af52187838223286a44a14b21d3439ba (diff) |
Do not expose error.
Drop from cache after rotation.
Diffstat (limited to 'container-accesslogging')
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java | 20 |
1 files changed, 17 insertions, 3 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 d729b092670..95f056288d5 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,6 +2,7 @@ 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; @@ -263,15 +264,28 @@ public class LogFileHandler extends StreamHandler { numberOfRecords = 0; lastRotationTime = now; nextRotationTime = 0; //figure it out later (lazy evaluation) - if (compressOnRotation && (oldFileName != null)) { - triggerCompression(oldFileName); + if ((oldFileName != null)) { + if (compressOnRotation) { + triggerCompression(oldFileName); + } else { + NativeIO nativeIO = new NativeIO(); + nativeIO.dropFileFromCache(new File(oldFileName)); + } } } private void triggerCompression(String oldFileName) { try { + String zippedFileName = oldFileName + ".gz"; Runtime r = Runtime.getRuntime(); - Process p = r.exec(new String[] { "gzip", oldFileName }); + StringBuilder cmd = new StringBuilder("gzip"); + cmd.append(" < "). append(oldFileName).append(" > ").append(zippedFileName); + Process p = r.exec(cmd.toString()); + NativeIO nativeIO = new NativeIO(); + File oldFile = new File(oldFileName); + nativeIO.dropFileFromCache(oldFile); + oldFile.delete(); + nativeIO.dropFileFromCache(new File(zippedFileName)); // 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) { |