summaryrefslogtreecommitdiffstats
path: root/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java
diff options
context:
space:
mode:
Diffstat (limited to 'container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java')
-rw-r--r--container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java23
1 files changed, 8 insertions, 15 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 1f56523bce6..135c3cd7af0 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
@@ -38,8 +38,6 @@ import java.util.zip.GZIPOutputStream;
public class LogFileHandler extends StreamHandler {
private final static Logger logger = Logger.getLogger(LogFileHandler.class.getName());
- /** True to use the sequence file name scheme, false (default) to use the date scheme */
- private final boolean useSequenceNameScheme;
private final boolean compressOnRotation;
private long[] rotationTimes = {0}; //default to one log per day, at midnight
private String filePattern = "./log.%T"; // default to current directory, ms time stamp
@@ -101,18 +99,17 @@ public class LogFileHandler extends StreamHandler {
private final LogThread logThread;
LogFileHandler() {
- this(AccessLogConfig.FileHandler.RotateScheme.Enum.DATE, false);
+ this(false);
}
- LogFileHandler(boolean compressOnRotation) {
- this(AccessLogConfig.FileHandler.RotateScheme.Enum.DATE, compressOnRotation);
- }
-
- LogFileHandler(AccessLogConfig.FileHandler.RotateScheme.Enum rotateScheme, boolean compressOnRotation)
+ LogFileHandler(boolean compressOnRotation)
{
super();
- this.useSequenceNameScheme = (rotateScheme == AccessLogConfig.FileHandler.RotateScheme.Enum.SEQUENCE);
this.compressOnRotation = compressOnRotation;
+ init();
+ }
+
+ private void init() {
logThread = new LogThread(this);
logThread.start();
}
@@ -237,22 +234,18 @@ public class LogFileHandler extends StreamHandler {
super.flush();
super.close();
- if (useSequenceNameScheme)
- moveCurrentFile();
-
try {
checkAndCreateDir(fileName);
FileOutputStream os = new FileOutputStream(fileName, true); // append mode, for safety
super.setOutputStream(os);
currentOutputStream = os;
- if (! useSequenceNameScheme) LogFileDb.nowLoggingTo(fileName);
+ LogFileDb.nowLoggingTo(fileName);
}
catch (IOException e) {
throw new RuntimeException("Couldn't open log file '" + fileName + "'", e);
}
- if ( ! useSequenceNameScheme)
- createSymlinkToCurrentFile();
+ createSymlinkToCurrentFile();
numberOfRecords = 0;
lastRotationTime = now;