This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push: new 9faa298 Better param and local var names. 9faa298 is described below commit 9faa2986502bdaf4052e9a179e95e3c98a632a8a Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Thu Nov 29 18:29:53 2018 -0700 Better param and local var names. --- .../log4j/core/appender/rolling/RollingFileManager.java | 10 +++++----- .../core/appender/rolling/RollingRandomAccessFileManager.java | 10 +++++----- .../appender/rolling/RollingRandomAccessFileManagerTest.java | 4 ++-- 3 files changed, 12 insertions(+), 12 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 ac16073..884b6d5 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 @@ -89,7 +89,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, @@ -97,11 +97,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); } @@ -598,11 +598,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 49b4b5d..d907613 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 @@ -52,12 +52,12 @@ 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 initialTime, final long time, 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, + super(loggerContext, fileName, pattern, os, append, false, initialTime, time, policy, strategy, advertiseURI, layout, filePermissions, fileOwner, fileGroup, writeHeader, ByteBuffer.wrap(new byte[bufferSize])); this.randomAccessFile = raf; @@ -193,7 +193,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { public RollingRandomAccessFileManager createManager(final String name, final FactoryData data) { File file = null; long size = 0; - long time = System.currentTimeMillis(); + long initialTime = System.currentTimeMillis(); RandomAccessFile raf = null; if (data.fileName != null) { file = new File(name); @@ -203,7 +203,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { } size = data.append ? file.length() : 0; if (file.exists()) { - time = file.lastModified(); + initialTime = file.lastModified(); } try { FileUtils.makeParentDirs(file); @@ -231,7 +231,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { final boolean writeHeader = !data.append || file == null || !file.exists(); final RollingRandomAccessFileManager rrm = new RollingRandomAccessFileManager(data.getLoggerContext(), raf, name, data.pattern, - NullOutputStream.getInstance(), data.append, data.immediateFlush, data.bufferSize, size, time, data.policy, + NullOutputStream.getInstance(), data.append, data.immediateFlush, data.bufferSize, size, initialTime, data.policy, data.strategy, data.advertiseURI, data.layout, data.filePermissions, data.fileOwner, data.fileGroup, writeHeader); if (rrm.isAttributeViewEnabled()) { rrm.defineAttributeView(file.toPath()); diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java index 8fa07b9..8f7f717 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java @@ -58,12 +58,12 @@ public class RollingRandomAccessFileManagerTest { final boolean append = false; final boolean flushNow = false; final long triggerSize = Long.MAX_VALUE; - final long time = System.currentTimeMillis(); + final long initialTime = System.currentTimeMillis(); final TriggeringPolicy triggerPolicy = new SizeBasedTriggeringPolicy(triggerSize); final RolloverStrategy rolloverStrategy = null; final RollingRandomAccessFileManager manager = new RollingRandomAccessFileManager(null, raf, file.getName(), Strings.EMPTY, os, append, flushNow, - RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE, triggerSize, time, triggerPolicy, rolloverStrategy, + RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE, triggerSize, initialTime, triggerPolicy, rolloverStrategy, null, null, null, null, null, true); final int size = RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE * 3;