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/08/20 01:10:29 UTC
logging-log4j2 git commit: Replace "lazyCreate" with "createOnDemand".
Repository: logging-log4j2
Updated Branches:
refs/heads/master b3d6a39b0 -> 4e5ef989c
Replace "lazyCreate" with "createOnDemand".
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4e5ef989
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4e5ef989
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4e5ef989
Branch: refs/heads/master
Commit: 4e5ef989c3126276f752435e91c6f7ea5ad0a52d
Parents: b3d6a39
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Aug 19 18:10:27 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Aug 19 18:10:27 2016 -0700
----------------------------------------------------------------------
.../log4j/core/appender/FileAppender.java | 12 ++---
.../log4j/core/appender/FileManager.java | 32 ++++++-------
.../core/appender/OutputStreamManager.java | 4 +-
.../core/appender/RollingFileAppender.java | 14 +++---
.../appender/rolling/RollingFileManager.java | 26 +++++------
.../log4j/core/appender/FileAppenderTest.java | 48 ++++++++++----------
.../rolling/RollingAppenderSizeTest.java | 38 ++++++++--------
.../test/resources/log4j-rolling-7z-lazy.xml | 2 +-
.../test/resources/log4j-rolling-bzip2-lazy.xml | 2 +-
.../resources/log4j-rolling-deflate-lazy.xml | 2 +-
.../test/resources/log4j-rolling-gz-lazy.xml | 2 +-
.../resources/log4j-rolling-pack200-lazy.xml | 2 +-
.../test/resources/log4j-rolling-xz-lazy.xml | 2 +-
.../test/resources/log4j-rolling-zip-lazy.xml | 2 +-
14 files changed, 94 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index e93e05f..5c8eff4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -70,7 +70,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
private String advertiseUri;
@PluginBuilderAttribute
- private boolean lazyCreate;
+ private boolean createOnDemand;
@PluginConfiguration
private Configuration config;
@@ -86,7 +86,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
}
Layout<? extends Serializable> layout = getOrCreateLayout();
- final FileManager manager = FileManager.getFileManager(fileName, append, locking, bufferedIo, lazyCreate,
+ final FileManager manager = FileManager.getFileManager(fileName, append, locking, bufferedIo, createOnDemand,
advertiseUri, layout, bufferSize, isImmediateFlush());
if (manager == null) {
return null;
@@ -124,8 +124,8 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
return bufferedIo;
}
- public boolean isLazyCreate() {
- return lazyCreate;
+ public boolean isCreateOnDemand() {
+ return createOnDemand;
}
public boolean isLocking() {
@@ -167,8 +167,8 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
return asBuilder();
}
- public B withLazyCreate(final boolean lazyCreate) {
- this.lazyCreate = lazyCreate;
+ public B withCreateOnDemand(final boolean createOnDemand) {
+ this.createOnDemand = createOnDemand;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index b8a559a..2b9024b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -40,7 +40,7 @@ public class FileManager extends OutputStreamManager {
private static final FileManagerFactory FACTORY = new FileManagerFactory();
private final boolean isAppend;
- private final boolean isLazyCreate;
+ private final boolean createOnDemand;
private final boolean isLocking;
private final String advertiseURI;
private final int bufferSize;
@@ -65,7 +65,7 @@ public class FileManager extends OutputStreamManager {
final ByteBuffer buffer) {
super(os, fileName, layout, writeHeader, buffer);
this.isAppend = append;
- this.isLazyCreate = false;
+ this.createOnDemand = false;
this.isLocking = locking;
this.advertiseURI = advertiseURI;
this.bufferSize = buffer.capacity();
@@ -75,12 +75,12 @@ public class FileManager extends OutputStreamManager {
* @throws IOException
* @since 2.7
*/
- protected FileManager(final String fileName, final OutputStream os, final boolean append, final boolean locking, final boolean lazyCreate,
+ protected FileManager(final String fileName, final OutputStream os, final boolean append, final boolean locking, final boolean createOnDemand,
final String advertiseURI, final Layout<? extends Serializable> layout, final boolean writeHeader,
final ByteBuffer buffer) throws IOException {
- super(os, fileName, lazyCreate, layout, writeHeader, buffer);
+ super(os, fileName, createOnDemand, layout, writeHeader, buffer);
this.isAppend = append;
- this.isLazyCreate = lazyCreate;
+ this.createOnDemand = createOnDemand;
this.isLocking = locking;
this.advertiseURI = advertiseURI;
this.bufferSize = buffer.capacity();
@@ -92,7 +92,7 @@ public class FileManager extends OutputStreamManager {
* @param append true if the file should be appended to, false if it should be overwritten.
* @param locking true if the file should be locked while writing, false otherwise.
* @param bufferedIo true if the contents should be buffered as they are written.
- * @param lazyCreate true if you want to lazy-create the file (a.k.a. on-demand.)
+ * @param createOnDemand true if you want to lazy-create the file (a.k.a. on-demand.)
* @param advertiseUri the URI to use when advertising the file
* @param layout The layout
* @param bufferSize buffer size for buffered IO
@@ -100,14 +100,14 @@ public class FileManager extends OutputStreamManager {
* @return A FileManager for the File.
*/
public static FileManager getFileManager(final String fileName, final boolean append, boolean locking,
- final boolean bufferedIo, final boolean lazyCreate, final String advertiseUri,
+ final boolean bufferedIo, final boolean createOnDemand, final String advertiseUri,
final Layout<? extends Serializable> layout, final int bufferSize, final boolean immediateFlush) {
if (locking && bufferedIo) {
locking = false;
}
return (FileManager) getManager(fileName,
- new FactoryData(append, locking, bufferedIo, bufferSize, immediateFlush, lazyCreate, advertiseUri, layout),
+ new FactoryData(append, locking, bufferedIo, bufferSize, immediateFlush, createOnDemand, advertiseUri, layout),
FACTORY);
}
@@ -162,8 +162,8 @@ public class FileManager extends OutputStreamManager {
* Returns the lazy-create.
* @return true if the file will be lazy-created.
*/
- public boolean isLazyCreate() {
- return isLazyCreate;
+ public boolean isCreateOnDemand() {
+ return createOnDemand;
}
/**
@@ -204,7 +204,7 @@ public class FileManager extends OutputStreamManager {
private final boolean bufferedIO;
private final int bufferSize;
private final boolean immediateFlush;
- private final boolean lazyCreate;
+ private final boolean createOnDemand;
private final String advertiseURI;
private final Layout<? extends Serializable> layout;
@@ -215,19 +215,19 @@ public class FileManager extends OutputStreamManager {
* @param bufferedIO Buffering flag.
* @param bufferSize Buffer size.
* @param immediateFlush flush on every write or not
- * @param lazyCreate if you want to lazy-create the file (a.k.a. on-demand.)
+ * @param createOnDemand if you want to lazy-create the file (a.k.a. on-demand.)
* @param advertiseURI the URI to use when advertising the file
* @param layout The layout
*/
public FactoryData(final boolean append, final boolean locking, final boolean bufferedIO, final int bufferSize,
- final boolean immediateFlush, final boolean lazyCreate, final String advertiseURI,
+ final boolean immediateFlush, final boolean createOnDemand, final String advertiseURI,
final Layout<? extends Serializable> layout) {
this.append = append;
this.locking = locking;
this.bufferedIO = bufferedIO;
this.bufferSize = bufferSize;
this.immediateFlush = immediateFlush;
- this.lazyCreate = lazyCreate;
+ this.createOnDemand = createOnDemand;
this.advertiseURI = advertiseURI;
this.layout = layout;
}
@@ -256,8 +256,8 @@ public class FileManager extends OutputStreamManager {
try {
final int actualSize = data.bufferedIO ? data.bufferSize : Constants.ENCODER_BYTE_BUFFER_SIZE;
final ByteBuffer buffer = ByteBuffer.wrap(new byte[actualSize]);
- final FileOutputStream fos = data.lazyCreate ? null : new FileOutputStream(file, data.append);
- return new FileManager(name, fos, data.append, data.locking, data.lazyCreate, data.advertiseURI, data.layout,
+ final FileOutputStream fos = data.createOnDemand ? null : new FileOutputStream(file, data.append);
+ return new FileManager(name, fos, data.append, data.locking, data.createOnDemand, data.advertiseURI, data.layout,
writeHeader, buffer);
} catch (final IOException ex) {
LOGGER.error("FileManager (" + name + ") " + ex, ex);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
index d895dd5..e5960ee 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
@@ -69,11 +69,11 @@ public class OutputStreamManager extends AbstractManager implements ByteBufferDe
* @throws IOException
* @since 2.7
*/
- protected OutputStreamManager(OutputStream os, final String streamName, final boolean lazyCreate,
+ protected OutputStreamManager(OutputStream os, final String streamName, final boolean createOnDemand,
final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer byteBuffer)
throws IOException {
super(streamName);
- if (lazyCreate && os != null) {
+ if (createOnDemand && os != null) {
LOGGER.error(
"Invalid OutputStreamManager configuration for '{}': You cannot both set the OutputStream and request on-demand.",
streamName);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index dc830e3..fcef0d6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -91,7 +91,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
private String advertiseUri;
@PluginBuilderAttribute
- private boolean lazyCreate;
+ private boolean createOnDemand;
@PluginConfiguration
private Configuration config;
@@ -136,7 +136,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
final RollingFileManager manager = RollingFileManager.getFileManager(fileName, filePattern, append,
bufferedIo, policy, strategy, advertiseUri, getLayout(), bufferSize, isImmediateFlush(),
- lazyCreate);
+ createOnDemand);
if (manager == null) {
return null;
}
@@ -175,8 +175,8 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
return bufferedIo;
}
- public boolean isLazyCreate() {
- return lazyCreate;
+ public boolean isCreateOnDemand() {
+ return createOnDemand;
}
public boolean isLocking() {
@@ -218,8 +218,8 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
return asBuilder();
}
- public B withLazyCreate(final boolean lazyCreate) {
- this.lazyCreate = lazyCreate;
+ public B withCreateOnDemand(final boolean createOnDemand) {
+ this.createOnDemand = createOnDemand;
return asBuilder();
}
@@ -379,7 +379,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
.withIgnoreExceptions(Booleans.parseBoolean(ignore, true))
.withImmediateFlush(Booleans.parseBoolean(immediateFlush, true))
.withLayout(layout)
- .withLazyCreate(false)
+ .withCreateOnDemand(false)
.withLocking(false)
.withName(name)
.withPolicy(policy)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
----------------------------------------------------------------------
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 5f390f1..3c6739f 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
@@ -85,11 +85,11 @@ public class RollingFileManager extends FileManager {
* @since 2.7
*/
protected RollingFileManager(final String fileName, final String pattern, final OutputStream os, final boolean append,
- final boolean lazyCreate, final long size, final long time, final TriggeringPolicy triggeringPolicy,
+ final boolean createOnDemand, final long size, final long time, final TriggeringPolicy triggeringPolicy,
final RolloverStrategy rolloverStrategy, final String advertiseURI,
final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer buffer)
throws IOException {
- super(fileName, os, append, false, lazyCreate, advertiseURI, layout, writeHeader, buffer);
+ super(fileName, os, append, false, createOnDemand, advertiseURI, layout, writeHeader, buffer);
this.size = size;
this.initialTime = time;
this.triggeringPolicy = triggeringPolicy;
@@ -114,16 +114,16 @@ public class RollingFileManager extends FileManager {
* @param layout The Layout.
* @param bufferSize buffer size to use if bufferedIO is true
* @param immediateFlush flush on every write or not
- * @param lazyCreate true if you want to lazy-create the file (a.k.a. on-demand.)
+ * @param createOnDemand true if you want to lazy-create the file (a.k.a. on-demand.)
* @return A RollingFileManager.
*/
public static RollingFileManager getFileManager(final String fileName, final String pattern, final boolean append,
final boolean bufferedIO, final TriggeringPolicy policy, final RolloverStrategy strategy,
final String advertiseURI, final Layout<? extends Serializable> layout, final int bufferSize,
- final boolean immediateFlush, final boolean lazyCreate) {
+ final boolean immediateFlush, final boolean createOnDemand) {
return (RollingFileManager) getManager(fileName, new FactoryData(pattern, append,
- bufferedIO, policy, strategy, advertiseURI, layout, bufferSize, immediateFlush, lazyCreate), factory);
+ bufferedIO, policy, strategy, advertiseURI, layout, bufferSize, immediateFlush, createOnDemand), factory);
}
// override to make visible for unit tests
@@ -347,7 +347,7 @@ public class RollingFileManager extends FileManager {
private final boolean bufferedIO;
private final int bufferSize;
private final boolean immediateFlush;
- private final boolean lazyCreate;
+ private final boolean createOnDemand;
private final TriggeringPolicy policy;
private final RolloverStrategy strategy;
private final String advertiseURI;
@@ -362,12 +362,12 @@ public class RollingFileManager extends FileManager {
* @param layout The Layout.
* @param bufferSize the buffer size
* @param immediateFlush flush on every write or not
- * @param lazyCreate true if you want to lazy-create the file (a.k.a. on-demand.)
+ * @param createOnDemand true if you want to lazy-create the file (a.k.a. on-demand.)
*/
public FactoryData(final String pattern, final boolean append, final boolean bufferedIO,
final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI,
final Layout<? extends Serializable> layout, final int bufferSize, final boolean immediateFlush,
- final boolean lazyCreate) {
+ final boolean createOnDemand) {
this.pattern = pattern;
this.append = append;
this.bufferedIO = bufferedIO;
@@ -377,7 +377,7 @@ public class RollingFileManager extends FileManager {
this.advertiseURI = advertiseURI;
this.layout = layout;
this.immediateFlush = immediateFlush;
- this.lazyCreate = lazyCreate;
+ this.createOnDemand = createOnDemand;
}
public TriggeringPolicy getTriggeringPolicy()
@@ -444,7 +444,7 @@ public class RollingFileManager extends FileManager {
// LOG4J2-1140: check writeHeader before creating the file
final boolean writeHeader = !data.append || !file.exists();
try {
- final boolean created = data.lazyCreate ? false : file.createNewFile();
+ final boolean created = data.createOnDemand ? false : file.createNewFile();
LOGGER.trace("New file '{}' created = {}", name, created);
} catch (final IOException ioe) {
LOGGER.error("Unable to create file " + name, ioe);
@@ -455,10 +455,10 @@ public class RollingFileManager extends FileManager {
try {
final int actualSize = data.bufferedIO ? data.bufferSize : Constants.ENCODER_BYTE_BUFFER_SIZE;
final ByteBuffer buffer = ByteBuffer.wrap(new byte[actualSize]);
- final OutputStream os = data.lazyCreate ? null : new FileOutputStream(name, data.append);
- final long time = data.lazyCreate? System.currentTimeMillis() : file.lastModified(); // LOG4J2-531 create file first so time has valid value
+ final OutputStream os = data.createOnDemand ? null : new FileOutputStream(name, data.append);
+ final long time = data.createOnDemand? System.currentTimeMillis() : file.lastModified(); // LOG4J2-531 create file first so time has valid value
- return new RollingFileManager(name, data.pattern, os, data.append, data.lazyCreate, size, time, data.policy,
+ return new RollingFileManager(name, data.pattern, os, data.append, data.createOnDemand, size, time, data.policy,
data.strategy, data.advertiseURI, data.layout, writeHeader, buffer);
} catch (final IOException ex) {
LOGGER.error("RollingFileManager (" + name + ") " + ex, ex);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
index feb9f11..0ffb9a0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
@@ -55,7 +55,7 @@ import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
public class FileAppenderTest {
- @Parameters(name = "lazyCreate = {0}")
+ @Parameters(name = "createOnDemand = {0}")
public static Boolean[] getParameters() {
return new Boolean[] { false, true };
}
@@ -64,12 +64,12 @@ public class FileAppenderTest {
private static final Path PATH = Paths.get(FILE_NAME);
private static final int THREADS = 2;
- public FileAppenderTest(boolean lazyCreate) {
+ public FileAppenderTest(boolean createOnDemand) {
super();
- this.lazyCreate = lazyCreate;
+ this.createOnDemand = createOnDemand;
}
- private final boolean lazyCreate;
+ private final boolean createOnDemand;
private final int threadCount = THREADS;
@Rule
@@ -83,7 +83,7 @@ public class FileAppenderTest {
@Test
public void testAppender() throws Exception {
final int logEventCount = 1;
- writer(false, logEventCount, "test", lazyCreate, false);
+ writer(false, logEventCount, "test", createOnDemand, false);
verifyFile(logEventCount);
}
@@ -99,18 +99,18 @@ public class FileAppenderTest {
.withBufferedIo(false)
.withBufferSize(1)
.withLayout(layout)
- .withLazyCreate(lazyCreate)
+ .withCreateOnDemand(createOnDemand)
.build();
// @formatter:on
- Assert.assertEquals(lazyCreate, appender.getManager().isLazyCreate());
+ Assert.assertEquals(createOnDemand, appender.getManager().isCreateOnDemand());
try {
- Assert.assertNotEquals(lazyCreate, Files.exists(PATH));
+ Assert.assertNotEquals(createOnDemand, Files.exists(PATH));
appender.start();
- Assert.assertNotEquals(lazyCreate, Files.exists(PATH));
+ Assert.assertNotEquals(createOnDemand, Files.exists(PATH));
} finally {
appender.stop();
}
- Assert.assertNotEquals(lazyCreate, Files.exists(PATH));
+ Assert.assertNotEquals(createOnDemand, Files.exists(PATH));
}
private static PatternLayout createPatternLayout() {
@@ -130,14 +130,14 @@ public class FileAppenderTest {
.withBufferedIo(false)
.withBufferSize(1)
.withLayout(layout)
- .withLazyCreate(lazyCreate)
+ .withCreateOnDemand(createOnDemand)
.build();
// @formatter:on
try {
appender.start();
final File file = new File(FILE_NAME);
assertTrue("Appender did not start", appender.isStarted());
- Assert.assertNotEquals(lazyCreate, Files.exists(PATH));
+ Assert.assertNotEquals(createOnDemand, Files.exists(PATH));
long curLen = file.length();
long prevLen = curLen;
assertTrue("File length: " + curLen, curLen == 0);
@@ -166,7 +166,7 @@ public class FileAppenderTest {
@Test
public void testLockingAppender() throws Exception {
final int logEventCount = 1;
- writer(true, logEventCount, "test", lazyCreate, false);
+ writer(true, logEventCount, "test", createOnDemand, false);
verifyFile(logEventCount);
}
@@ -208,7 +208,7 @@ public class FileAppenderTest {
final ProcessBuilder[] builders = new ProcessBuilder[processCount];
for (int index = 0; index < processCount; ++index) {
builders[index] = new ProcessBuilder("java", "-cp", classPath, ProcessTest.class.getName(),
- "Process " + index, logEventCount.toString(), "true", Boolean.toString(lazyCreate));
+ "Process " + index, logEventCount.toString(), "true", Boolean.toString(createOnDemand));
}
for (int index = 0; index < processCount; ++index) {
processes[index] = builders[index].start();
@@ -227,7 +227,7 @@ public class FileAppenderTest {
verifyFile(logEventCount * processCount);
}
- private static void writer(final boolean locking, final int logEventCount, final String name, boolean lazyCreate,
+ private static void writer(final boolean locking, final int logEventCount, final String name, boolean createOnDemand,
boolean concurrent) throws Exception {
final Layout<String> layout = createPatternLayout();
// @formatter:off
@@ -239,23 +239,23 @@ public class FileAppenderTest {
.withLocking(locking)
.withBufferedIo(false)
.withLayout(layout)
- .withLazyCreate(lazyCreate)
+ .withCreateOnDemand(createOnDemand)
.build();
// @formatter:on
- Assert.assertEquals(lazyCreate, appender.getManager().isLazyCreate());
+ Assert.assertEquals(createOnDemand, appender.getManager().isCreateOnDemand());
try {
appender.start();
assertTrue("Appender did not start", appender.isStarted());
final boolean exists = Files.exists(PATH);
- String msg = String.format("concurrent = %s, lazyCreate = %s, file exists = %s", concurrent, lazyCreate,
+ String msg = String.format("concurrent = %s, createOnDemand = %s, file exists = %s", concurrent, createOnDemand,
exists);
// If concurrent the file might have been created (or not.)
- // Can't really test lazyCreate && concurrent.
- final boolean expectFileCreated = !lazyCreate;
+ // Can't really test createOnDemand && concurrent.
+ final boolean expectFileCreated = !createOnDemand;
if (concurrent && expectFileCreated) {
Assert.assertTrue(msg, exists);
} else if (expectFileCreated) {
- Assert.assertNotEquals(msg, lazyCreate, exists);
+ Assert.assertNotEquals(msg, createOnDemand, exists);
}
for (int i = 0; i < logEventCount; ++i) {
final LogEvent logEvent = Log4jLogEvent.newBuilder().setLoggerName("TestLogger")
@@ -310,7 +310,7 @@ public class FileAppenderTest {
final Thread thread = Thread.currentThread();
try {
- writer(lock, logEventCount, thread.getName(), lazyCreate, true);
+ writer(lock, logEventCount, thread.getName(), createOnDemand, true);
} catch (final Exception ex) {
exceptionRef[0] = ex;
throw new RuntimeException(ex);
@@ -336,12 +336,12 @@ public class FileAppenderTest {
}
final boolean lock = Boolean.parseBoolean(args[2]);
- final boolean lazyCreate = Boolean.parseBoolean(args[2]);
+ final boolean createOnDemand = Boolean.parseBoolean(args[2]);
// System.out.println("Got arguments " + id + ", " + count + ", " + lock);
try {
- writer(lock, count, id, lazyCreate, true);
+ writer(lock, count, id, createOnDemand, true);
// thread.sleep(50);
} catch (final Exception ex) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
index 0560301..d354b41 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
@@ -66,34 +66,34 @@ public class RollingAppenderSizeTest {
private Logger logger;
- private final boolean lazyCreate;
+ private final boolean createOnDemand;
- @Parameterized.Parameters(name = "{0} \u2192 {1} (lazyCreate = {2})")
+ @Parameterized.Parameters(name = "{0} \u2192 {1} (createOnDemand = {2})")
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] { //
// @formatter:off
- {"log4j-rolling-gz-lazy.xml", ".gz", true}, //
- {"log4j-rolling-gz.xml", ".gz", false}, //
- {"log4j-rolling-zip-lazy.xml", ".zip", true}, //
- {"log4j-rolling-zip.xml", ".zip", false}, //
+ {"log4j-rolling-gz-lazy.xml", ".gz", true},
+ {"log4j-rolling-gz.xml", ".gz", false},
+ {"log4j-rolling-zip-lazy.xml", ".zip", true},
+ {"log4j-rolling-zip.xml", ".zip", false},
// Apache Commons Compress
- {"log4j-rolling-bzip2-lazy.xml", ".bz2", true}, //
- {"log4j-rolling-bzip2.xml", ".bz2", false}, //
- {"log4j-rolling-deflate-lazy.xml", ".deflate", true}, //
- {"log4j-rolling-deflate.xml", ".deflate", false}, //
- {"log4j-rolling-pack200-lazy.xml", ".pack200", true}, //
- {"log4j-rolling-pack200.xml", ".pack200", false}, //
- {"log4j-rolling-xz-lazy.xml", ".xz", true}, //
- {"log4j-rolling-xz.xml", ".xz", false}, //
+ {"log4j-rolling-bzip2-lazy.xml", ".bz2", true},
+ {"log4j-rolling-bzip2.xml", ".bz2", false},
+ {"log4j-rolling-deflate-lazy.xml", ".deflate", true},
+ {"log4j-rolling-deflate.xml", ".deflate", false},
+ {"log4j-rolling-pack200-lazy.xml", ".pack200", true},
+ {"log4j-rolling-pack200.xml", ".pack200", false},
+ {"log4j-rolling-xz-lazy.xml", ".xz", true},
+ {"log4j-rolling-xz.xml", ".xz", false},
});
// @formatter:on
}
private LoggerContextRule loggerContextRule;
- public RollingAppenderSizeTest(final String configFile, final String fileExtension, final boolean lazyCreate) {
+ public RollingAppenderSizeTest(final String configFile, final String fileExtension, final boolean createOnDemand) {
this.fileExtension = fileExtension;
- this.lazyCreate = lazyCreate;
+ this.createOnDemand = createOnDemand;
this.loggerContextRule = new LoggerContextRule(configFile);
this.chain = loggerContextRule.withCleanFoldersRule(DIR);
}
@@ -104,18 +104,18 @@ public class RollingAppenderSizeTest {
}
@Test
- public void testIsLazyCreate() {
+ public void testIsCreateOnDemand() {
final RollingFileAppender rfAppender = loggerContextRule.getRequiredAppender("RollingFile",
RollingFileAppender.class);
final RollingFileManager manager = rfAppender.getManager();
Assert.assertNotNull(manager);
- Assert.assertEquals(lazyCreate, manager.isLazyCreate());
+ Assert.assertEquals(createOnDemand, manager.isCreateOnDemand());
}
@Test
public void testAppender() throws Exception {
final Path path = Paths.get(DIR, "rollingtest.log");
- if (Files.exists(path) && lazyCreate) {
+ if (Files.exists(path) && createOnDemand) {
Assert.fail(String.format("Unexpected file: %s (%s bytes)", path, Files.getAttribute(path, "size")));
}
for (int i = 0; i < 100; ++i) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/resources/log4j-rolling-7z-lazy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-7z-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-7z-lazy.xml
index ce16320..597f102 100644
--- a/log4j-core/src/test/resources/log4j-rolling-7z-lazy.xml
+++ b/log4j-core/src/test/resources/log4j-rolling-7z-lazy.xml
@@ -28,7 +28,7 @@
</Console>
<RollingFile name="RollingFile" fileName="${filename}"
filePattern="target/rolling1/test1-$${date:MM-dd-yyyy}-%i.log.7z"
- lazyCreate="true">
+ createOnDemand="true">
<PatternLayout>
<Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml
index 6697293..eed50b1 100644
--- a/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml
+++ b/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml
@@ -28,7 +28,7 @@
</Console>
<RollingFile name="RollingFile" fileName="${filename}"
filePattern="target/rolling1/test1-$${date:MM-dd-yyyy}-%i.log.bz2"
- lazyCreate="true">
+ createOnDemand="true">
<PatternLayout>
<Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml
index d4561f7..1501db7 100644
--- a/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml
+++ b/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml
@@ -28,7 +28,7 @@
</Console>
<RollingFile name="RollingFile" fileName="${filename}"
filePattern="target/rolling1/test1-$${date:MM-dd-yyyy}-%i.log.deflate"
- lazyCreate="true">
+ createOnDemand="true">
<PatternLayout>
<Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/resources/log4j-rolling-gz-lazy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-gz-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-gz-lazy.xml
index f9bfd90..fb85da5 100644
--- a/log4j-core/src/test/resources/log4j-rolling-gz-lazy.xml
+++ b/log4j-core/src/test/resources/log4j-rolling-gz-lazy.xml
@@ -28,7 +28,7 @@
</Console>
<RollingFile name="RollingFile" fileName="${filename}"
filePattern="target/rolling1/test1-$${date:MM-dd-yyyy}-%i.log.gz"
- lazyCreate="true">
+ createOnDemand="true">
<PatternLayout>
<Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml
index 7355e61..db8a6dd 100644
--- a/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml
+++ b/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml
@@ -28,7 +28,7 @@
</Console>
<RollingFile name="RollingFile" fileName="${filename}"
filePattern="target/rolling1/test1-$${date:MM-dd-yyyy}-%i.log.pack200"
- lazyCreate="true">
+ createOnDemand="true">
<PatternLayout>
<Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml
index 02aa528..560741c 100644
--- a/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml
+++ b/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml
@@ -28,7 +28,7 @@
</Console>
<RollingFile name="RollingFile" fileName="${filename}"
filePattern="target/rolling1/test1-$${date:MM-dd-yyyy}-%i.log.xz"
- lazyCreate="true">
+ createOnDemand="true">
<PatternLayout>
<Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e5ef989/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml
index 2641d7f..06249d8 100644
--- a/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml
+++ b/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml
@@ -28,7 +28,7 @@
</Console>
<RollingFile name="RollingFile" fileName="${filename}"
filePattern="target/rolling1/test1-$${date:MM-dd-yyyy}-%i.log.zip"
- lazyCreate="true">
+ createOnDemand="true">
<PatternLayout>
<Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>