diff options
Diffstat (limited to 'container-accesslogging/src/main')
4 files changed, 7 insertions, 63 deletions
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java index 452466d7d05..46e5aa95dab 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java @@ -61,7 +61,6 @@ public class AccessLogEntry { private long timeStampMillis; private long durationBetweenRequestResponseMillis; private long numBytesReturned; - private URI uri; private String remoteAddress; @@ -600,27 +599,6 @@ public class AccessLogEntry { } } - /** - * @deprecated Use {@link #setRawPath(String)} and {@link #setRawQuery(String)} instead. - */ - @Deprecated - public void setURI(final URI uri) { - synchronized (monitor) { - requireNull(this.uri); - this.uri = uri; - } - } - - /** - * @deprecated Use {@link #getRawPath()} and {@link #getRawQuery()} instead. This method may return wrong path. - */ - @Deprecated - public URI getURI() { - synchronized (monitor) { - return uri; - } - } - public void setRemoteAddress(String remoteAddress) { synchronized (monitor) { requireNull(this.remoteAddress); diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogHandler.java index a31e7b3b849..488a6137cc2 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogHandler.java @@ -3,8 +3,6 @@ package com.yahoo.container.logging; import com.yahoo.container.core.AccessLogConfig; -import static com.yahoo.container.core.AccessLogConfig.FileHandler.RotateScheme.DATE; - import java.util.logging.Logger; /** @@ -18,14 +16,12 @@ class AccessLogHandler { public AccessLogHandler(AccessLogConfig.FileHandler config) { access.setUseParentHandlers(false); - logFileHandler = new LogFileHandler(config.rotateScheme(), config.compressOnRotation()); + logFileHandler = new LogFileHandler(config.compressOnRotation()); logFileHandler.setFilePattern(config.pattern()); logFileHandler.setRotationTimes(config.rotation()); - if (config.rotateScheme() == DATE) - createSymlink(config, logFileHandler); - + createSymlink(config, logFileHandler); LogFormatter lf = new LogFormatter(); lf.messageOnly(true); 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..3912a3be853 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,17 +99,12 @@ 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; logThread = new LogThread(this); logThread.start(); @@ -237,22 +230,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; diff --git a/container-accesslogging/src/main/resources/configdefinitions/access-log.def b/container-accesslogging/src/main/resources/configdefinitions/access-log.def index 9df9299ae19..788fadcdf90 100644 --- a/container-accesslogging/src/main/resources/configdefinitions/access-log.def +++ b/container-accesslogging/src/main/resources/configdefinitions/access-log.def @@ -9,28 +9,9 @@ fileHandler.pattern string # Could just configure "every N minutes" instead fileHandler.rotation string default="0 60 ..." -# TODO remove in Vespa 7, always use DATE -# -# Defines how file rotation is done. There are two options: -# -# DATE: -# The active log file is given the name resulting from pattern (but in this case "pattern" must yield a -# time-dependent name. In addition, a symlink is created pointing to the newest file. -# The symlink is given the name of the symlink parameter (or the name of this service -# if no parameter is given. -# -# SEQUENCE: -# The active log file is given the name -# defined by "pattern" (which in this case will likely just be a constant string). -# At rotation, this file is given the name pattern.N where N is 1 + the largest integer found by -# extracting the integers from all files ending by .Integer in the same directory -# -fileHandler.rotateScheme enum {DATE, SEQUENCE} default=DATE - # Use this as the name of the symlink created pointing to the newest file in the "date" naming scheme. # This is ignored if the sequence naming scheme is used. fileHandler.symlink string default="" # compress the previous access log after rotation -# TODO change to "true" for Vespa 7 -fileHandler.compressOnRotation bool default=false +fileHandler.compressOnRotation bool default=true |