You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/11/12 09:26:23 UTC
logging-log4j2 git commit: Rename internal vars from "isForce" to
"immediateFlush" for consistency with other appenders.
Repository: logging-log4j2
Updated Branches:
refs/heads/master d1b904a1e -> 26ddb5926
Rename internal vars from "isForce" to "immediateFlush" for consistency
with other appenders.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/26ddb592
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/26ddb592
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/26ddb592
Branch: refs/heads/master
Commit: 26ddb59263490af4946ed7fd309b83ab75e24108
Parents: d1b904a
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Nov 12 01:26:18 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Nov 12 01:26:18 2016 -0800
----------------------------------------------------------------------
.../core/appender/MemoryMappedFileManager.java | 24 ++++++++++----------
.../appender/MemoryMappedFileManagerTest.java | 8 +++----
2 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/26ddb592/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
index 13c5294..6fea619 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
@@ -64,7 +64,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
private static final MemoryMappedFileManagerFactory FACTORY = new MemoryMappedFileManagerFactory();
private static final double NANOS_PER_MILLISEC = 1000.0 * 1000.0;
- private final boolean isForce;
+ private final boolean immediateFlush;
private final int regionLength;
private final String advertiseURI;
private final RandomAccessFile randomAccessFile;
@@ -73,10 +73,10 @@ public class MemoryMappedFileManager extends OutputStreamManager {
private long mappingOffset;
protected MemoryMappedFileManager(final RandomAccessFile file, final String fileName, final OutputStream os,
- final boolean force, final long position, final int regionLength, final String advertiseURI,
+ final boolean immediateFlush, final long position, final int regionLength, final String advertiseURI,
final Layout<? extends Serializable> layout, final boolean writeHeader) throws IOException {
super(os, fileName, layout, writeHeader, ByteBuffer.wrap(new byte[0]));
- this.isForce = force;
+ this.immediateFlush = immediateFlush;
this.randomAccessFile = Objects.requireNonNull(file, "RandomAccessFile");
this.regionLength = regionLength;
this.advertiseURI = advertiseURI;
@@ -91,16 +91,16 @@ public class MemoryMappedFileManager extends OutputStreamManager {
*
* @param fileName The name of the file to manage.
* @param append true if the file should be appended to, false if it should be overwritten.
- * @param isForce true if the contents should be flushed to disk on every write
+ * @param immediateFlush true if the contents should be flushed to disk on every write
* @param regionLength The mapped region length.
* @param advertiseURI the URI to use when advertising the file
* @param layout The layout.
* @return A MemoryMappedFileManager for the File.
*/
public static MemoryMappedFileManager getFileManager(final String fileName, final boolean append,
- final boolean isForce, final int regionLength, final String advertiseURI,
+ final boolean immediateFlush, final int regionLength, final String advertiseURI,
final Layout<? extends Serializable> layout) {
- return (MemoryMappedFileManager) getManager(fileName, new FactoryData(append, isForce, regionLength,
+ return (MemoryMappedFileManager) getManager(fileName, new FactoryData(append, immediateFlush, regionLength,
advertiseURI, layout), FACTORY);
}
@@ -252,7 +252,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
* @return whether each write should be force-sync'ed
*/
public boolean isImmediateFlush() {
- return isForce;
+ return immediateFlush;
}
/**
@@ -291,7 +291,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
*/
private static class FactoryData {
private final boolean append;
- private final boolean force;
+ private final boolean immediateFlush;
private final int regionLength;
private final String advertiseURI;
private final Layout<? extends Serializable> layout;
@@ -300,15 +300,15 @@ public class MemoryMappedFileManager extends OutputStreamManager {
* Constructor.
*
* @param append Append to existing file or truncate.
- * @param force forces the memory content to be written to the storage device on every event
+ * @param immediateFlush forces the memory content to be written to the storage device on every event
* @param regionLength length of the mapped region
* @param advertiseURI the URI to use when advertising the file
* @param layout The layout.
*/
- public FactoryData(final boolean append, final boolean force, final int regionLength,
+ public FactoryData(final boolean append, final boolean immediateFlush, final int regionLength,
final String advertiseURI, final Layout<? extends Serializable> layout) {
this.append = append;
- this.force = force;
+ this.immediateFlush = immediateFlush;
this.regionLength = regionLength;
this.advertiseURI = advertiseURI;
this.layout = layout;
@@ -347,7 +347,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
raf = new RandomAccessFile(name, "rw");
final long position = (data.append) ? raf.length() : 0;
raf.setLength(position + data.regionLength);
- return new MemoryMappedFileManager(raf, name, os, data.force, position, data.regionLength,
+ return new MemoryMappedFileManager(raf, name, os, data.immediateFlush, position, data.regionLength,
data.advertiseURI, data.layout, writeHeader);
} catch (final Exception ex) {
LOGGER.error("MemoryMappedFileManager (" + name + ") " + ex, ex);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/26ddb592/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java
index 9f132a8..6cb7e3b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java
@@ -43,9 +43,9 @@ public class MemoryMappedFileManagerTest {
assertEquals(0, file.length());
final boolean append = false;
- final boolean force = false;
+ final boolean immediateFlush = false;
try (final MemoryMappedFileManager manager = MemoryMappedFileManager.getFileManager(file.getAbsolutePath(),
- append, force, mapSize, null, null)) {
+ append, immediateFlush, mapSize, null, null)) {
byte[] msg;
for (int i = 0; i < 1000; i++) {
msg = ("Message " + i + "\n").getBytes();
@@ -80,9 +80,9 @@ public class MemoryMappedFileManagerTest {
assertEquals("all flushed to disk", initialLength, file.length());
final boolean isAppend = true;
- final boolean isForce = false;
+ final boolean immediateFlush = false;
try (final MemoryMappedFileManager manager = MemoryMappedFileManager.getFileManager(file.getAbsolutePath(),
- isAppend, isForce, MemoryMappedFileManager.DEFAULT_REGION_LENGTH, null, null)) {
+ isAppend, immediateFlush, MemoryMappedFileManager.DEFAULT_REGION_LENGTH, null, null)) {
manager.write(new byte[initialLength], 0, initialLength);
}
final int expected = initialLength * 2;