This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push: new 33c3e22 Better param name. 33c3e22 is described below commit 33c3e22969d3dca97c9a55fb09861b2df1ef93b7 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Thu Nov 29 18:28:31 2018 -0700 Better param name. --- .../core/appender/rolling/RollingFileManager.java | 26 +++++++++++----------- .../rolling/RollingRandomAccessFileManager.java | 7 +++--- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java index 202761e..4a99e53 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java @@ -87,41 +87,41 @@ public class RollingFileManager extends FileManager { @Deprecated protected RollingFileManager(final String fileName, final String pattern, final OutputStream os, - final boolean append, final long size, final long time, final TriggeringPolicy triggeringPolicy, + final boolean append, final long size, final long initialTime, final TriggeringPolicy triggeringPolicy, final RolloverStrategy rolloverStrategy, final String advertiseURI, final Layout<? extends Serializable> layout, final int bufferSize, final boolean writeHeader) { - this(fileName, pattern, os, append, size, time, triggeringPolicy, rolloverStrategy, advertiseURI, layout, + this(fileName, pattern, os, append, size, initialTime, triggeringPolicy, rolloverStrategy, advertiseURI, layout, writeHeader, ByteBuffer.wrap(new byte[Constants.ENCODER_BYTE_BUFFER_SIZE])); } @Deprecated protected RollingFileManager(final String fileName, final String pattern, final OutputStream os, - final boolean append, final long size, final long time, final TriggeringPolicy triggeringPolicy, + final boolean append, final long size, final long initialTime, final TriggeringPolicy triggeringPolicy, final RolloverStrategy rolloverStrategy, final String advertiseURI, final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer buffer) { super(fileName, os, append, false, advertiseURI, layout, writeHeader, buffer); this.size = size; - this.initialTime = time; + this.initialTime = initialTime; this.triggeringPolicy = triggeringPolicy; this.rolloverStrategy = rolloverStrategy; this.patternProcessor = new PatternProcessor(pattern); - this.patternProcessor.setPrevFileTime(time); + this.patternProcessor.setPrevFileTime(initialTime); this.fileName = fileName; this.fileExtension = FileExtension.lookupForFile(pattern); } @Deprecated protected RollingFileManager(final LoggerContext loggerContext, final String fileName, final String pattern, final OutputStream os, - final boolean append, final boolean createOnDemand, final long size, final long time, + final boolean append, final boolean createOnDemand, final long size, final long initialTime, final TriggeringPolicy triggeringPolicy, final RolloverStrategy rolloverStrategy, final String advertiseURI, final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer buffer) { super(loggerContext, fileName, os, append, false, createOnDemand, advertiseURI, layout, writeHeader, buffer); this.size = size; - this.initialTime = time; + this.initialTime = initialTime; this.triggeringPolicy = triggeringPolicy; this.rolloverStrategy = rolloverStrategy; this.patternProcessor = new PatternProcessor(pattern); - this.patternProcessor.setPrevFileTime(time); + this.patternProcessor.setPrevFileTime(initialTime); this.fileName = fileName; this.fileExtension = FileExtension.lookupForFile(pattern); } @@ -130,7 +130,7 @@ public class RollingFileManager extends FileManager { * @since 2.9 */ protected RollingFileManager(final LoggerContext loggerContext, final String fileName, final String pattern, final OutputStream os, - final boolean append, final boolean createOnDemand, final long size, final long time, + final boolean append, final boolean createOnDemand, final long size, final long initialTime, final TriggeringPolicy triggeringPolicy, final RolloverStrategy rolloverStrategy, final String advertiseURI, final Layout<? extends Serializable> layout, final String filePermissions, final String fileOwner, final String fileGroup, @@ -138,11 +138,11 @@ public class RollingFileManager extends FileManager { super(loggerContext, fileName, os, append, false, createOnDemand, advertiseURI, layout, filePermissions, fileOwner, fileGroup, writeHeader, buffer); this.size = size; - this.initialTime = time; + this.initialTime = initialTime; this.triggeringPolicy = triggeringPolicy; this.rolloverStrategy = rolloverStrategy; this.patternProcessor = new PatternProcessor(pattern); - this.patternProcessor.setPrevFileTime(time); + this.patternProcessor.setPrevFileTime(initialTime); this.fileName = fileName; this.fileExtension = FileExtension.lookupForFile(pattern); } @@ -644,11 +644,11 @@ public class RollingFileManager extends FileManager { final ByteBuffer buffer = ByteBuffer.wrap(new byte[actualSize]); final OutputStream os = data.createOnDemand || data.fileName == null ? null : new FileOutputStream(data.fileName, data.append); - final long time = data.createOnDemand || file == null ? + final long initialTime = data.createOnDemand || file == null ? 0 : initialFileTime(file); // LOG4J2-531 create file first so time has valid value final RollingFileManager rm = new RollingFileManager(data.getLoggerContext(), data.fileName, data.pattern, os, - data.append, data.createOnDemand, size, time, data.policy, data.strategy, data.advertiseURI, + data.append, data.createOnDemand, size, initialTime, data.policy, data.strategy, data.advertiseURI, data.layout, data.filePermissions, data.fileOwner, data.fileGroup, writeHeader, buffer); if (os != null && rm.isAttributeViewEnabled()) { rm.defineAttributeView(file.toPath()); diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java index a3fb930..a0cd5ec 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java @@ -62,14 +62,13 @@ public class RollingRandomAccessFileManager extends RollingFileManager { */ public RollingRandomAccessFileManager(final LoggerContext loggerContext, final RandomAccessFile raf, final String fileName, final String pattern, final OutputStream os, final boolean append, - final boolean immediateFlush, final int bufferSize, final long size, final long time, + final boolean immediateFlush, final int bufferSize, final long size, final long initialTime, final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI, final Layout<? extends Serializable> layout, final String filePermissions, final String fileOwner, final String fileGroup, final boolean writeHeader) { - super(loggerContext, fileName, pattern, os, append, false, size, time, policy, strategy, advertiseURI, layout, - filePermissions, fileOwner, fileGroup, - writeHeader, ByteBuffer.wrap(new byte[bufferSize])); + super(loggerContext, fileName, pattern, os, append, false, size, initialTime, policy, strategy, advertiseURI, + layout, filePermissions, fileOwner, fileGroup, writeHeader, ByteBuffer.wrap(new byte[bufferSize])); this.randomAccessFile = raf; isEndOfBatch.set(Boolean.FALSE); writeHeader();