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 2013/07/29 18:45:00 UTC
svn commit: r1508130 - in /logging/log4j/log4j2/trunk:
core/src/main/java/org/apache/logging/log4j/core/appender/
core/src/main/java/org/apache/logging/log4j/core/appender/rolling/
core/src/main/java/org/apache/logging/log4j/core/async/ core/src/test/j...
Author: ggregory
Date: Mon Jul 29 16:44:59 2013
New Revision: 1508130
URL: http://svn.apache.org/r1508130
Log:
[LOG4J2-317] Rename FastFileAppender and FastRollingFileAppender to RandomAccessFileAppender and RollingRandomAccessFileAppender.
Added:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderLocationTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderLocationTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileManagerTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileManagerTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderLocationTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderLocationTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderRolloverTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderRolloverTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastXmlFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManagerTest.java
logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml
- copied, changed from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastXmlFileAppenderTest.xml
Removed:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderLocationTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileManagerTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderLocationTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderRolloverTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastXmlFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManagerTest.java
logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/FastXmlFileAppenderTest.xml
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
logging/log4j/log4j2/trunk/src/site/site.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java (from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java Mon Jul 29 16:44:59 2013
@@ -39,14 +39,14 @@ import org.apache.logging.log4j.core.net
* @param <T> The {@link Layout}'s {@link Serializable} type.
*/
@Plugin(name = "FastFile", category = "Core", elementType = "appender", printObject = true)
-public final class FastFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public final class RandomAccessFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
private final String fileName;
private Object advertisement;
private final Advertiser advertiser;
- private FastFileAppender(final String name, final Layout<T> layout, final Filter filter,
- final FastFileManager manager, final String filename, final boolean ignoreExceptions,
+ private RandomAccessFileAppender(final String name, final Layout<T> layout, final Filter filter,
+ final RandomAccessFileManager manager, final String filename, final boolean ignoreExceptions,
final boolean immediateFlush, final Advertiser advertiser) {
super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
if (advertiser != null) {
@@ -83,7 +83,7 @@ public final class FastFileAppender<T ex
// From a user's point of view, this means that all log events are
// _always_ available in the log file, without incurring the overhead
// of immediateFlush=true.
- ((FastFileManager) getManager()).setEndOfBatch(event.isEndOfBatch());
+ ((RandomAccessFileManager) getManager()).setEndOfBatch(event.isEndOfBatch());
super.append(event);
}
@@ -121,7 +121,7 @@ public final class FastFileAppender<T ex
* @return The FileAppender.
*/
@PluginFactory
- public static <S extends Serializable> FastFileAppender<S> createAppender(
+ public static <S extends Serializable> RandomAccessFileAppender<S> createAppender(
@PluginAttr("fileName") final String fileName,
@PluginAttr("append") final String append,
@PluginAttr("name") final String name,
@@ -154,14 +154,14 @@ public final class FastFileAppender<T ex
Layout<S> l = (Layout<S>) PatternLayout.createLayout(null, null, null, null, null);
layout = l;
}
- final FastFileManager manager = FastFileManager.getFileManager(
+ final RandomAccessFileManager manager = RandomAccessFileManager.getFileManager(
fileName, isAppend, isFlush, advertiseURI, layout
);
if (manager == null) {
return null;
}
- return new FastFileAppender<S>(
+ return new RandomAccessFileAppender<S>(
name, layout, filter, manager, fileName, ignoreExceptions, isFlush,
isAdvertise ? config.getAdvertiser() : null
);
Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java (from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java Mon Jul 29 16:44:59 2013
@@ -31,10 +31,10 @@ import org.apache.logging.log4j.core.Lay
* this class uses a {@code ByteBuffer} and a {@code RandomAccessFile} to do the
* I/O.
*/
-public class FastFileManager extends OutputStreamManager {
+public class RandomAccessFileManager extends OutputStreamManager {
static final int DEFAULT_BUFFER_SIZE = 256 * 1024;
- private static final FastFileManagerFactory FACTORY = new FastFileManagerFactory();
+ private static final RandomAccessFileManagerFactory FACTORY = new RandomAccessFileManagerFactory();
private final boolean isImmediateFlush;
private final String advertiseURI;
@@ -42,7 +42,7 @@ public class FastFileManager extends Out
private final ByteBuffer buffer;
private final ThreadLocal<Boolean> isEndOfBatch = new ThreadLocal<Boolean>();
- protected FastFileManager(final RandomAccessFile file,
+ protected RandomAccessFileManager(final RandomAccessFile file,
final String fileName, final OutputStream os,
final boolean immediateFlush, final String advertiseURI,
final Layout layout) {
@@ -57,7 +57,7 @@ public class FastFileManager extends Out
}
/**
- * Returns the FastFileManager.
+ * Returns the RandomAccessFileManager.
*
* @param fileName The name of the file to manage.
* @param append true if the file should be appended to, false if it should
@@ -66,12 +66,12 @@ public class FastFileManager extends Out
* write
* @param advertiseURI the URI to use when advertising the file
* @param layout The layout.
- * @return A FastFileManager for the File.
+ * @return A RandomAccessFileManager for the File.
*/
- public static FastFileManager getFileManager(final String fileName,
+ public static RandomAccessFileManager getFileManager(final String fileName,
final boolean append, final boolean isFlush,
final String advertiseURI, final Layout layout) {
- return (FastFileManager) getManager(fileName, new FactoryData(append,
+ return (RandomAccessFileManager) getManager(fileName, new FactoryData(append,
isFlush, advertiseURI, layout), FACTORY);
}
@@ -185,20 +185,20 @@ public class FastFileManager extends Out
}
/**
- * Factory to create a FastFileManager.
+ * Factory to create a RandomAccessFileManager.
*/
- private static class FastFileManagerFactory implements
- ManagerFactory<FastFileManager, FactoryData> {
+ private static class RandomAccessFileManagerFactory implements
+ ManagerFactory<RandomAccessFileManager, FactoryData> {
/**
- * Create a FastFileManager.
+ * Create a RandomAccessFileManager.
*
* @param name The name of the File.
* @param data The FactoryData
- * @return The FastFileManager for the File.
+ * @return The RandomAccessFileManager for the File.
*/
@Override
- public FastFileManager createManager(final String name, final FactoryData data) {
+ public RandomAccessFileManager createManager(final String name, final FactoryData data) {
final File file = new File(name);
final File parent = file.getParentFile();
if (null != parent && !parent.exists()) {
@@ -217,10 +217,10 @@ public class FastFileManager extends Out
} else {
raf.setLength(0);
}
- return new FastFileManager(raf, name, os, data.immediateFlush,
+ return new RandomAccessFileManager(raf, name, os, data.immediateFlush,
data.advertiseURI, data.layout);
} catch (final Exception ex) {
- LOGGER.error("FastFileManager (" + name + ") " + ex);
+ LOGGER.error("RandomAccessFileManager (" + name + ") " + ex);
}
return null;
}
Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java (from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java Mon Jul 29 16:44:59 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.rolling.DefaultRolloverStrategy;
-import org.apache.logging.log4j.core.appender.rolling.FastRollingFileManager;
+import org.apache.logging.log4j.core.appender.rolling.RollingRandomAccessFileManager;
import org.apache.logging.log4j.core.appender.rolling.RollingFileManager;
import org.apache.logging.log4j.core.appender.rolling.RolloverStrategy;
import org.apache.logging.log4j.core.appender.rolling.TriggeringPolicy;
@@ -45,14 +45,14 @@ import org.apache.logging.log4j.core.net
* @param <T> The {@link Layout}'s {@link Serializable} type.
*/
@Plugin(name = "FastRollingFile", category = "Core", elementType = "appender", printObject = true)
-public final class FastRollingFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public final class RollingRandomAccessFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
private final String fileName;
private final String filePattern;
private Object advertisement;
private final Advertiser advertiser;
- private FastRollingFileAppender(final String name, final Layout<T> layout,
+ private RollingRandomAccessFileAppender(final String name, final Layout<T> layout,
final Filter filter, final RollingFileManager manager, final String fileName,
final String filePattern, final boolean ignoreExceptions,
final boolean immediateFlush, final Advertiser advertiser) {
@@ -84,7 +84,7 @@ public final class FastRollingFileAppend
*/
@Override
public void append(final LogEvent event) {
- final FastRollingFileManager manager = (FastRollingFileManager) getManager();
+ final RollingRandomAccessFileManager manager = (RollingRandomAccessFileManager) getManager();
manager.checkRollover(event);
// Leverage the nice batching behaviour of async Loggers/Appenders:
@@ -116,7 +116,7 @@ public final class FastRollingFileAppend
}
/**
- * Create a FastRollingFileAppender.
+ * Create a RollingRandomAccessFileAppender.
*
* @param fileName The name of the file that is actively written to.
* (required).
@@ -140,10 +140,10 @@ public final class FastRollingFileAppend
* file contents.
* @param config The Configuration.
* @param <S> The {@link Layout}'s {@link Serializable} type.
- * @return A FastRollingFileAppender.
+ * @return A RollingRandomAccessFileAppender.
*/
@PluginFactory
- public static <S extends Serializable> FastRollingFileAppender<S> createAppender(
+ public static <S extends Serializable> RollingRandomAccessFileAppender<S> createAppender(
@PluginAttr("fileName") final String fileName,
@PluginAttr("filePattern") final String filePattern,
@PluginAttr("append") final String append,
@@ -198,13 +198,13 @@ public final class FastRollingFileAppend
}
- final FastRollingFileManager manager = FastRollingFileManager.getFastRollingFileManager(fileName, filePattern,
+ final RollingRandomAccessFileManager manager = RollingRandomAccessFileManager.getRollingRandomAccessFileManager(fileName, filePattern,
isAppend, isFlush, policy, strategy, advertiseURI, layout);
if (manager == null) {
return null;
}
- return new FastRollingFileAppender<S>(name, layout, filter, manager,
+ return new RollingRandomAccessFileAppender<S>(name, layout, filter, manager,
fileName, filePattern, ignoreExceptions, isFlush,
isAdvertise ? config.getAdvertiser() : null);
}
Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java (from r1508090, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java Mon Jul 29 16:44:59 2013
@@ -31,17 +31,17 @@ import org.apache.logging.log4j.core.app
* this class uses a {@code ByteBuffer} and a {@code RandomAccessFile} to do the
* I/O.
*/
-public class FastRollingFileManager extends RollingFileManager {
+public class RollingRandomAccessFileManager extends RollingFileManager {
static final int DEFAULT_BUFFER_SIZE = 256 * 1024;
- private static final FastRollingFileManagerFactory FACTORY = new FastRollingFileManagerFactory();
+ private static final RollingRandomAccessFileManagerFactory FACTORY = new RollingRandomAccessFileManagerFactory();
private final boolean isImmediateFlush;
private RandomAccessFile randomAccessFile;
private final ByteBuffer buffer;
private final ThreadLocal<Boolean> isEndOfBatch = new ThreadLocal<Boolean>();
- public FastRollingFileManager(final RandomAccessFile raf, final String fileName,
+ public RollingRandomAccessFileManager(final RandomAccessFile raf, final String fileName,
final String pattern, final OutputStream os, final boolean append,
final boolean immediateFlush, final long size, final long time,
final TriggeringPolicy policy, final RolloverStrategy strategy,
@@ -55,10 +55,10 @@ public class FastRollingFileManager exte
buffer = ByteBuffer.allocate(DEFAULT_BUFFER_SIZE);
}
- public static FastRollingFileManager getFastRollingFileManager(final String fileName, final String filePattern,
+ public static RollingRandomAccessFileManager getRollingRandomAccessFileManager(final String fileName, final String filePattern,
final boolean isAppend, final boolean immediateFlush, final TriggeringPolicy policy,
final RolloverStrategy strategy, final String advertiseURI, final Layout layout) {
- return (FastRollingFileManager) getManager(fileName, new FactoryData(filePattern, isAppend, immediateFlush,
+ return (RollingRandomAccessFileManager) getManager(fileName, new FactoryData(filePattern, isAppend, immediateFlush,
policy, strategy, advertiseURI, layout), FACTORY);
}
@@ -122,19 +122,19 @@ public class FastRollingFileManager exte
}
/**
- * Factory to create a FastRollingFileManager.
+ * Factory to create a RollingRandomAccessFileManager.
*/
- private static class FastRollingFileManagerFactory implements ManagerFactory<FastRollingFileManager, FactoryData> {
+ private static class RollingRandomAccessFileManagerFactory implements ManagerFactory<RollingRandomAccessFileManager, FactoryData> {
/**
- * Create the FastRollingFileManager.
+ * Create the RollingRandomAccessFileManager.
*
* @param name The name of the entity to manage.
* @param data The data required to create the entity.
* @return a RollingFileManager.
*/
@Override
- public FastRollingFileManager createManager(final String name, final FactoryData data) {
+ public RollingRandomAccessFileManager createManager(final String name, final FactoryData data) {
final File file = new File(name);
final File parent = file.getParentFile();
if (null != parent && !parent.exists()) {
@@ -155,10 +155,10 @@ public class FastRollingFileManager exte
} else {
raf.setLength(0);
}
- return new FastRollingFileManager(raf, name, data.pattern, new DummyOutputStream(), data.append,
+ return new RollingRandomAccessFileManager(raf, name, data.pattern, new DummyOutputStream(), data.append,
data.immediateFlush, size, time, data.policy, data.strategy, data.advertiseURI, data.layout);
} catch (final IOException ex) {
- LOGGER.error("FastRollingFileManager (" + name + ") " + ex);
+ LOGGER.error("RollingRandomAccessFileManager (" + name + ") " + ex);
}
return null;
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java Mon Jul 29 16:44:59 2013
@@ -64,8 +64,8 @@ import com.lmax.disruptor.util.Util;
* your log4j.xml configuration will produce either a "?" character or no output
* at all.
* <p>
- * For best performance, use AsyncLogger with the FastFileAppender or
- * FastRollingFileAppender, with immediateFlush=false. These appenders have
+ * For best performance, use AsyncLogger with the RandomAccessFileAppender or
+ * RollingRandomAccessFileAppender, with immediateFlush=false. These appenders have
* built-in support for the batching mechanism used by the Disruptor library,
* and they will flush to disk at the end of each batch. This means that even
* with immediateFlush=false, there will never be any items left in the buffer;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Mon Jul 29 16:44:59 2013
@@ -57,8 +57,8 @@ import org.apache.logging.log4j.status.S
* your log4j.xml configuration will produce either a "?" character or no output
* at all.
* <p>
- * For best performance, use AsyncLoggerConfig with the FastFileAppender or
- * FastRollingFileAppender, with immediateFlush=false. These appenders have
+ * For best performance, use AsyncLoggerConfig with the RandomAccessFileAppender or
+ * RollingRandomAccessFileAppender, with immediateFlush=false. These appenders have
* built-in support for the batching mechanism used by the Disruptor library,
* and they will flush to disk at the end of each batch. This means that even
* with immediateFlush=false, there will never be any items left in the buffer;
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderLocationTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderLocationTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderLocationTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderLocationTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderLocationTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderLocationTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderLocationTest.java Mon Jul 29 16:44:59 2013
@@ -29,17 +29,17 @@ import org.apache.logging.log4j.core.con
import org.junit.BeforeClass;
import org.junit.Test;
-public class FastFileAppenderLocationTest {
+public class RandomAccessFileAppenderLocationTest {
@BeforeClass
public static void beforeClass() {
System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
- "FastFileAppenderLocationTest.xml");
+ "RandomAccessFileAppenderLocationTest.xml");
}
@Test
public void testLocationIncluded() throws Exception {
- final File f = new File("target", "FastFileAppenderLocationTest.log");
+ final File f = new File("target", "RandomAccessFileAppenderLocationTest.log");
// System.out.println(f.getAbsolutePath());
f.delete();
final Logger log = LogManager.getLogger("com.foo.Bar");
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTest.java Mon Jul 29 16:44:59 2013
@@ -29,17 +29,17 @@ import org.apache.logging.log4j.core.con
import org.junit.BeforeClass;
import org.junit.Test;
-public class FastFileAppenderTest {
+public class RandomAccessFileAppenderTest {
@BeforeClass
public static void beforeClass() {
System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
- "FastFileAppenderTest.xml");
+ "RandomAccessFileAppenderTest.xml");
}
@Test
public void testFlushAtEndOfBatch() throws Exception {
- final File f = new File("target", "FastFileAppenderTest.log");
+ final File f = new File("target", "RandomAccessFileAppenderTest.log");
// System.out.println(f.getAbsolutePath());
f.delete();
final Logger log = LogManager.getLogger("com.foo.Bar");
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileManagerTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileManagerTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileManagerTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileManagerTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileManagerTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastFileManagerTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileManagerTest.java Mon Jul 29 16:44:59 2013
@@ -27,13 +27,13 @@ import java.io.RandomAccessFile;
import org.junit.Test;
/**
- * Tests the FastFileManager class.
+ * Tests the RandomAccessFileManager class.
*/
-public class FastFileManagerTest {
+public class RandomAccessFileManagerTest {
/**
* Test method for
- * {@link org.apache.logging.log4j.core.appender.FastFileManager#write(byte[], int, int)}
+ * {@link org.apache.logging.log4j.core.appender.RandomAccessFileManager#write(byte[], int, int)}
* .
*/
@Test
@@ -41,21 +41,21 @@ public class FastFileManagerTest {
final File file = File.createTempFile("log4j2", "test");
file.deleteOnExit();
final RandomAccessFile raf = new RandomAccessFile(file, "rw");
- final OutputStream os = new FastFileManager.DummyOutputStream();
- final FastFileManager manager = new FastFileManager(raf, file.getName(), os,
+ final OutputStream os = new RandomAccessFileManager.DummyOutputStream();
+ final RandomAccessFileManager manager = new RandomAccessFileManager(raf, file.getName(), os,
false, null, null);
- final int size = FastFileManager.DEFAULT_BUFFER_SIZE * 3;
+ final int size = RandomAccessFileManager.DEFAULT_BUFFER_SIZE * 3;
final byte[] data = new byte[size];
manager.write(data); // no buffer overflow exception
// buffer is full but not flushed yet
- assertEquals(FastFileManager.DEFAULT_BUFFER_SIZE * 2, raf.length());
+ assertEquals(RandomAccessFileManager.DEFAULT_BUFFER_SIZE * 2, raf.length());
}
/**
* Test method for
- * {@link org.apache.logging.log4j.core.appender.FastFileManager#write(byte[], int, int)}
+ * {@link org.apache.logging.log4j.core.appender.RandomAccessFileManager#write(byte[], int, int)}
* .
*/
@Test
@@ -63,14 +63,14 @@ public class FastFileManagerTest {
final File file = File.createTempFile("log4j2", "test");
file.deleteOnExit();
final RandomAccessFile raf = new RandomAccessFile(file, "rw");
- final OutputStream os = new FastFileManager.DummyOutputStream();
- final FastFileManager manager = new FastFileManager(raf, file.getName(), os,
+ final OutputStream os = new RandomAccessFileManager.DummyOutputStream();
+ final RandomAccessFileManager manager = new RandomAccessFileManager(raf, file.getName(), os,
false, null, null);
- final int size = FastFileManager.DEFAULT_BUFFER_SIZE * 3 + 1;
+ final int size = RandomAccessFileManager.DEFAULT_BUFFER_SIZE * 3 + 1;
final byte[] data = new byte[size];
manager.write(data); // no exception
- assertEquals(FastFileManager.DEFAULT_BUFFER_SIZE * 3, raf.length());
+ assertEquals(RandomAccessFileManager.DEFAULT_BUFFER_SIZE * 3, raf.length());
manager.flush();
assertEquals(size, raf.length()); // all data written to file now
@@ -96,7 +96,7 @@ public class FastFileManagerTest {
}
assertEquals("all flushed to disk", bytes.length, file.length());
- final FastFileManager manager = FastFileManager.getFileManager(
+ final RandomAccessFileManager manager = RandomAccessFileManager.getFileManager(
file.getAbsolutePath(), isAppend, true, null, null);
manager.write(bytes, 0, bytes.length);
final int expected = bytes.length * 2;
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderLocationTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderLocationTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderLocationTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderLocationTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderLocationTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderLocationTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderLocationTest.java Mon Jul 29 16:44:59 2013
@@ -29,17 +29,17 @@ import org.apache.logging.log4j.core.con
import org.junit.BeforeClass;
import org.junit.Test;
-public class FastRollingFileAppenderLocationTest {
+public class RollingRandomAccessFileAppenderLocationTest {
@BeforeClass
public static void beforeClass() {
System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
- "FastRollingFileAppenderLocationTest.xml");
+ "RollingRandomAccessFileAppenderLocationTest.xml");
}
@Test
public void testLocationIncluded() throws Exception {
- final File f = new File("target", "FastRollingFileAppenderLocationTest.log");
+ final File f = new File("target", "RollingRandomAccessFileAppenderLocationTest.log");
// System.out.println(f.getAbsolutePath());
f.delete();
final Logger log = LogManager.getLogger("com.foo.Bar");
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderRolloverTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderRolloverTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderRolloverTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderRolloverTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderRolloverTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderRolloverTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderRolloverTest.java Mon Jul 29 16:44:59 2013
@@ -30,17 +30,17 @@ import org.apache.logging.log4j.core.con
import org.junit.BeforeClass;
import org.junit.Test;
-public class FastRollingFileAppenderRolloverTest {
+public class RollingRandomAccessFileAppenderRolloverTest {
@BeforeClass
public static void beforeClass() {
System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
- "FastRollingFileAppenderTest.xml");
+ "RollingRandomAccessFileAppenderTest.xml");
}
@Test
public void testRollover() throws Exception {
- final File f = new File("target", "FastRollingFileAppenderTest.log");
+ final File f = new File("target", "RollingRandomAccessFileAppenderTest.log");
// System.out.println(f.getAbsolutePath());
final File after1 = new File("target", "afterRollover-1.log");
f.delete();
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastRollingFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppenderTest.java Mon Jul 29 16:44:59 2013
@@ -29,17 +29,17 @@ import org.apache.logging.log4j.core.con
import org.junit.BeforeClass;
import org.junit.Test;
-public class FastRollingFileAppenderTest {
+public class RollingRandomAccessFileAppenderTest {
@BeforeClass
public static void beforeClass() {
System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
- "FastRollingFileAppenderTest.xml");
+ "RollingRandomAccessFileAppenderTest.xml");
}
@Test
public void testFlushAtEndOfBatch() throws Exception {
- final File f = new File("target", "FastRollingFileAppenderTest.log");
+ final File f = new File("target", "RollingRandomAccessFileAppenderTest.log");
// System.out.println(f.getAbsolutePath());
f.delete();
final Logger log = LogManager.getLogger("com.foo.Bar");
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastXmlFileAppenderTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastXmlFileAppenderTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FastXmlFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java Mon Jul 29 16:44:59 2013
@@ -33,18 +33,18 @@ import org.junit.Test;
/**
* Tests a "complete" XML file a.k.a. a well-formed XML file.
*/
-public class FastXmlFileAppenderTest {
+public class XmlRandomAccessFileAppenderTest {
@BeforeClass
public static void beforeClass() {
System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
- "FastXmlFileAppenderTest.xml");
+ "XmlRandomAccessFileAppenderTest.xml");
}
@Test
@Ignore
public void testFlushAtEndOfBatch() throws Exception {
- final File f = new File("target", "FastXmlFileAppenderTest.log");
+ final File f = new File("target", "XmlRandomAccessFileAppenderTest.log");
// System.out.println(f.getAbsolutePath());
f.delete();
final Logger log = LogManager.getLogger("com.foo.Bar");
Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java (from r1508090, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManagerTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManagerTest.java&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManagerTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java Mon Jul 29 16:44:59 2013
@@ -29,13 +29,13 @@ import java.util.concurrent.locks.LockSu
import org.junit.Test;
/**
- * Tests the FastRollingFileManager class.
+ * Tests the RollingRandomAccessFileManager class.
*/
-public class FastRollingFileManagerTest {
+public class RollingRandomAccessFileManagerTest {
/**
* Test method for
- * {@link org.apache.logging.log4j.core.appender.rolling.FastRollingFileManager#write(byte[], int, int)}
+ * {@link org.apache.logging.log4j.core.appender.rolling.RollingRandomAccessFileManager#write(byte[], int, int)}
* .
*/
@Test
@@ -43,7 +43,7 @@ public class FastRollingFileManagerTest
final File file = File.createTempFile("log4j2", "test");
file.deleteOnExit();
final RandomAccessFile raf = new RandomAccessFile(file, "rw");
- final OutputStream os = new FastRollingFileManager.DummyOutputStream();
+ final OutputStream os = new RollingRandomAccessFileManager.DummyOutputStream();
final boolean append = false;
final boolean flushNow = false;
final long triggerSize = Long.MAX_VALUE;
@@ -51,22 +51,22 @@ public class FastRollingFileManagerTest
final TriggeringPolicy triggerPolicy = new SizeBasedTriggeringPolicy(
triggerSize);
final RolloverStrategy rolloverStrategy = null;
- final FastRollingFileManager manager = new FastRollingFileManager(raf,
+ final RollingRandomAccessFileManager manager = new RollingRandomAccessFileManager(raf,
file.getName(), "", os, append, flushNow, triggerSize, time,
triggerPolicy, rolloverStrategy, null, null);
- final int size = FastRollingFileManager.DEFAULT_BUFFER_SIZE * 3;
+ final int size = RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE * 3;
final byte[] data = new byte[size];
manager.write(data, 0, data.length); // no buffer overflow exception
// buffer is full but not flushed yet
- assertEquals(FastRollingFileManager.DEFAULT_BUFFER_SIZE * 2,
+ assertEquals(RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE * 2,
raf.length());
}
/**
* Test method for
- * {@link org.apache.logging.log4j.core.appender.rolling.FastRollingFileManager#write(byte[], int, int)}
+ * {@link org.apache.logging.log4j.core.appender.rolling.RollingRandomAccessFileManager#write(byte[], int, int)}
* .
*/
@Test
@@ -74,7 +74,7 @@ public class FastRollingFileManagerTest
final File file = File.createTempFile("log4j2", "test");
file.deleteOnExit();
final RandomAccessFile raf = new RandomAccessFile(file, "rw");
- final OutputStream os = new FastRollingFileManager.DummyOutputStream();
+ final OutputStream os = new RollingRandomAccessFileManager.DummyOutputStream();
final boolean append = false;
final boolean flushNow = false;
final long triggerSize = 0;
@@ -82,14 +82,14 @@ public class FastRollingFileManagerTest
final TriggeringPolicy triggerPolicy = new SizeBasedTriggeringPolicy(
triggerSize);
final RolloverStrategy rolloverStrategy = null;
- final FastRollingFileManager manager = new FastRollingFileManager(raf,
+ final RollingRandomAccessFileManager manager = new RollingRandomAccessFileManager(raf,
file.getName(), "", os, append, flushNow, triggerSize, time,
triggerPolicy, rolloverStrategy, null, null);
- final int size = FastRollingFileManager.DEFAULT_BUFFER_SIZE * 3 + 1;
+ final int size = RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE * 3 + 1;
final byte[] data = new byte[size];
manager.write(data, 0, data.length); // no exception
- assertEquals(FastRollingFileManager.DEFAULT_BUFFER_SIZE * 3,
+ assertEquals(RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE * 3,
raf.length());
manager.flush();
@@ -116,8 +116,8 @@ public class FastRollingFileManagerTest
}
assertEquals("all flushed to disk", bytes.length, file.length());
- final FastRollingFileManager manager = FastRollingFileManager
- .getFastRollingFileManager(
+ final RollingRandomAccessFileManager manager = RollingRandomAccessFileManager
+ .getRollingRandomAccessFileManager(
//
file.getAbsolutePath(), "", isAppend, true,
new SizeBasedTriggeringPolicy(Long.MAX_VALUE), //
@@ -140,8 +140,8 @@ public class FastRollingFileManagerTest
final long expectedMax = expectedMin + 50;
assertTrue(file.lastModified() < expectedMin);
- final FastRollingFileManager manager = FastRollingFileManager
- .getFastRollingFileManager(
+ final RollingRandomAccessFileManager manager = RollingRandomAccessFileManager
+ .getRollingRandomAccessFileManager(
//
file.getAbsolutePath(), "", isAppend, true,
new SizeBasedTriggeringPolicy(Long.MAX_VALUE), //
@@ -160,8 +160,8 @@ public class FastRollingFileManagerTest
final boolean isAppend = true;
assertTrue(file.lastModified() < System.currentTimeMillis());
- final FastRollingFileManager manager = FastRollingFileManager
- .getFastRollingFileManager(
+ final RollingRandomAccessFileManager manager = RollingRandomAccessFileManager
+ .getRollingRandomAccessFileManager(
//
file.getAbsolutePath(), "", isAppend, true,
new SizeBasedTriggeringPolicy(Long.MAX_VALUE), //
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java Mon Jul 29 16:44:59 2013
@@ -243,10 +243,10 @@ public class PerfTestDriver {
// appenders
// tests.add(s("perf1syncFile.xml", LOG20, "FileAppender"));
- // tests.add(s("perf1syncFastFile.xml", LOG20, "FastFileAppender"));
+ // tests.add(s("perf1syncRandomAccessFile.xml", LOG20, "RandomAccessFileAppender"));
// tests.add(s("perf2syncRollFile.xml", LOG20, "RollFileAppender"));
- // tests.add(s("perf2syncRollFastFile.xml", LOG20,
- // "RollFastFileAppender"));
+ // tests.add(s("perf2syncRollRandomAccessFile.xml", LOG20,
+ // "RollRandomAccessFileAppender"));
final int MAX_THREADS = 16; // 64 takes a LONG time
for (int i = 2; i <= MAX_THREADS; i *= 2) {
@@ -277,12 +277,12 @@ public class PerfTestDriver {
// appenders
// tests.add(m("perf1syncFile.xml", LOG20, "FileAppender", i));
- // tests.add(m("perf1syncFastFile.xml", LOG20, "FastFileAppender",
+ // tests.add(m("perf1syncRandomAccessFile.xml", LOG20, "RandomAccessFileAppender",
// i));
// tests.add(m("perf2syncRollFile.xml", LOG20, "RollFileAppender",
// i));
- // tests.add(m("perf2syncRollFastFile.xml", LOG20,
- // "RollFastFileAppender", i));
+ // tests.add(m("perf2syncRollRandomAccessFile.xml", LOG20,
+ // "RollRandomAccessFileAppender", i));
}
final String java = args.length > 0 ? args[0] : "java";
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml Mon Jul 29 16:44:59 2013
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="target/AsyncLoggerLocationTest.log"
+ <RandomAccessFile name="RandomAccessFile" fileName="target/AsyncLoggerLocationTest.log"
immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %location %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<root level="info" includeLocation="true">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml Mon Jul 29 16:44:59 2013
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="target/AsyncLoggerTest.log"
+ <RandomAccessFile name="RandomAccessFile" fileName="target/AsyncLoggerTest.log"
immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %location %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<root level="info" includeLocation="false">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Copied: logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml (from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderLocationTest.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml?p2=logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml&p1=logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderLocationTest.xml&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderLocationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml Mon Jul 29 16:44:59 2013
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="target/FastFileAppenderLocationTest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="target/RandomAccessFileAppenderLocationTest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %m %location %ex%n</pattern>
<!--
<pattern>%d %p %c{1.} %C %location %line [%t] %X{aKey} %m %ex%n</pattern>
-->
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<asyncRoot level="info" includeLocation="true">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Copied: logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml (from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderTest.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml?p2=logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml&p1=logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderTest.xml&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/FastFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml Mon Jul 29 16:44:59 2013
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="target/FastFileAppenderTest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="target/RandomAccessFileAppenderTest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %m %location %ex%n</pattern>
<!--
<pattern>%d %p %c{1.} %C %location %line [%t] %X{aKey} %m %ex%n</pattern>
-->
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<asyncRoot level="info" includeLocation="false">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Copied: logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml (from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderLocationTest.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml?p2=logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml&p1=logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderLocationTest.xml&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderLocationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml Mon Jul 29 16:44:59 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastRollingFile name="FastRollingFile" fileName="target/FastRollingFileAppenderLocationTest.log"
+ <RollingRandomAccessFile name="RollingRandomAccessFile" fileName="target/RollingRandomAccessFileAppenderLocationTest.log"
filePattern="test-%d{MM-dd-yyyy}-%i.log.gz" append="false"
immediateFlush="false">
<PatternLayout>
@@ -10,12 +10,12 @@
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
- </FastRollingFile>
+ </RollingRandomAccessFile>
</appenders>
<loggers>
<asyncRoot level="info" includeLocation="true">
- <appender-ref ref="FastRollingFile"/>
+ <appender-ref ref="RollingRandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Copied: logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml (from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderTest.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml?p2=logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml&p1=logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderTest.xml&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/FastRollingFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml Mon Jul 29 16:44:59 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastRollingFile name="FastRollingFile" fileName="target/FastRollingFileAppenderTest.log"
+ <RollingRandomAccessFile name="RollingRandomAccessFile" fileName="target/RollingRandomAccessFileAppenderTest.log"
filePattern="target/afterRollover-%i.log" append="false"
immediateFlush="false">
<PatternLayout>
@@ -10,12 +10,12 @@
<Policies>
<SizeBasedTriggeringPolicy size="250 B"/>
</Policies>
- </FastRollingFile>
+ </RollingRandomAccessFile>
</appenders>
<loggers>
<asyncRoot level="info" includeLocation="false">
- <appender-ref ref="FastRollingFile"/>
+ <appender-ref ref="RollingRandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Copied: logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml (from r1508090, logging/log4j/log4j2/trunk/core/src/test/resources/FastXmlFileAppenderTest.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml?p2=logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml&p1=logging/log4j/log4j2/trunk/core/src/test/resources/FastXmlFileAppenderTest.xml&r1=1508090&r2=1508130&rev=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/FastXmlFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml Mon Jul 29 16:44:59 2013
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastXmlFile" fileName="target/FastXmlFileAppenderTest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="XmlRandomAccessFile" fileName="target/XmlRandomAccessFileAppenderTest.log" immediateFlush="false" append="false">
<XMLLayout complete="true"/>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<asyncRoot level="info" includeLocation="false">
- <appender-ref ref="FastXmlFile"/>
+ <appender-ref ref="XmlRandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml Mon Jul 29 16:44:59 2013
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="perftest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<root level="info" includeLocation="false">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml Mon Jul 29 16:44:59 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastRollingFile name="FastRollingFile" fileName="perftest.log"
+ <RollingRandomAccessFile name="RollingRandomAccessFile" fileName="perftest.log"
filePattern="app-%d{MM-dd-yyyy}-%i.log.gz" append="false"
immediateFlush="false">
<PatternLayout>
@@ -10,11 +10,11 @@
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
- </FastRollingFile>
+ </RollingRandomAccessFile>
</appenders>
<loggers>
<root level="info" includeLocation="false">
- <appender-ref ref="FastRollingFile"/>
+ <appender-ref ref="RollingRandomAccessFile"/>
</root>
</loggers>
</configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml Mon Jul 29 16:44:59 2013
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="perftest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<root level="info" includeLocation="false">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml Mon Jul 29 16:44:59 2013
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="perftest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} %C %location %line [%t] %X{aKey} %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<root level="info" includeLocation="true">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml Mon Jul 29 16:44:59 2013
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="perftest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
<Async name="Async" blocking="true" bufferSize="262144">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</Async>
</appenders>
<loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml Mon Jul 29 16:44:59 2013
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="perftest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} %C %location %line [%t] %X{aKey} %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
<Async name="Async" includeLocation="true" blocking="true" bufferSize="262144">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</Async>
</appenders>
<loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml Mon Jul 29 16:44:59 2013
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="perftest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %X{aKey} %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<asyncRoot level="info" includeLocation="false">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml Mon Jul 29 16:44:59 2013
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="OFF">
<appenders>
- <FastFile name="FastFile" fileName="perftest.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} %C %location %line [%t] %X{aKey} %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<asyncRoot level="info" includeLocation="true">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Jul 29 16:44:59 2013
@@ -21,6 +21,9 @@
</properties>
<body>
<release version="2.0-beta9" date="soon, very soon" description="Bug fixes and enhancements">
+ <action issue="LOG4J2-317" dev="ggregory" type="update">
+ Rename FastFileAppender and FastRollingFileAppender to RandomAccessFileAppender and RollingRandomAccessFileAppender.
+ </action>
<action issue="LOG4J2-280" dev="rpopma" type="fix">
Additional fix to make AsyncAppender threads daemon threads and improve their thread name.
</action>
Modified: logging/log4j/log4j2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/site.xml Mon Jul 29 16:44:59 2013
@@ -86,8 +86,8 @@
<item name="Async" href="/manual/appenders.html#AsyncAppender"/>
<item name="Console" href="/manual/appenders.html#ConsoleAppender"/>
<item name="Failover" href="/manual/appenders.html#FailoverAppender"/>
- <item name="FastFile" href="/manual/appenders.html#FastFileAppender"/>
- <item name="FastRollingFile" href="/manual/appenders.html#FastRollingFileAppender"/>
+ <item name="RandomAccessFile" href="/manual/appenders.html#RandomAccessFileAppender"/>
+ <item name="RollingRandomAccessFile" href="/manual/appenders.html#RollingRandomAccessFileAppender"/>
<item name="File" href="/manual/appenders.html#FileAppender"/>
<item name="Flume" href="/manual/appenders.html#FlumeAppender"/>
<item name="JDBC" href="/manual/appenders.html#JDBCAppender"/>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Mon Jul 29 16:44:59 2013
@@ -283,11 +283,11 @@
</configuration>]]></pre>
</p>
</subsection>
- <a name="FastFileAppender" />
- <subsection name="FastFileAppender">
+ <a name="RandomAccessFileAppender" />
+ <subsection name="RandomAccessFileAppender">
<p><i>Experimental, may replace FileAppender in a future release.</i></p>
<p>
- The FastFileAppender is similar to the standard
+ The RandomAccessFileAppender is similar to the standard
<a href="#FileAppender">FileAppender</a>
except it is always buffered (this cannot be switched off)
and internally it uses a
@@ -296,12 +296,12 @@
<tt>BufferedOutputStream</tt>.
We saw a 20-200% performance improvement compared to
FileAppender with "bufferedIO=true" in our
- <a href="async.html#FastFileAppenderPerformance">measurements</a>.
+ <a href="async.html#RandomAccessFileAppenderPerformance">measurements</a>.
Similar to the FileAppender,
- FastFileAppender uses a FastFileManager to actually perform the
- file I/O. While FastFileAppender
+ RandomAccessFileAppender uses a RandomAccessFileManager to actually perform the
+ file I/O. While RandomAccessFileAppender
from different Configurations
- cannot be shared, the FastFileManagers can be if the Manager is
+ cannot be shared, the RandomAccessFileManagers can be if the Manager is
accessible. For example, two web applications in a
servlet container can have
their own configuration and safely
@@ -371,19 +371,19 @@
caller, instead. You must set this to <code>false</code> when wrapping this Appender in a
<a href="#FailoverAppender">FailoverAppender</a>.</td>
</tr>
- <caption align="top">FastFileAppender Parameters</caption>
+ <caption align="top">RandomAccessFileAppender Parameters</caption>
</table>
<p>
- Here is a sample FastFile configuration:
+ Here is a sample RandomAccessFile configuration:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <FastFile name="MyFile" fileName="logs/app.log">
+ <RandomAccessFile name="MyFile" fileName="logs/app.log">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<root level="error">
@@ -393,11 +393,11 @@
</configuration>]]></pre>
</p>
</subsection>
- <a name="FastRollingFileAppender" />
- <subsection name="FastRollingFileAppender">
+ <a name="RollingRandomAccessFileAppender" />
+ <subsection name="RollingRandomAccessFileAppender">
<p><i>Experimental, may replace RollingFileAppender in a future release.</i></p>
<p>
- The FastRollingFileAppender is similar to the standard
+ The RollingRandomAccessFileAppender is similar to the standard
<a href="#RollingFileAppender">RollingFileAppender</a>
except it is always buffered (this cannot be switched off)
and
@@ -408,9 +408,9 @@
We saw a 20-200% performance improvement compared to
RollingFileAppender with "bufferedIO=true"
in our
- <a href="async.html#FastFileAppenderPerformance">measurements</a>.
+ <a href="async.html#RandomAccessFileAppenderPerformance">measurements</a>.
- The FastRollingFileAppender writes
+ The RollingRandomAccessFileAppender writes
to the File named in the
fileName parameter
and rolls the file over according the
@@ -418,18 +418,18 @@
and the RolloverPolicy.
Similar to the RollingFileAppender,
- FastRollingFileAppender uses a FastRollingFileManager
+ RollingRandomAccessFileAppender uses a RollingRandomAccessFileManager
to actually perform the
- file I/O and perform the rollover. While FastRollingFileAppender
+ file I/O and perform the rollover. While RollingRandomAccessFileAppender
from different Configurations cannot be
- shared, the FastRollingFileManagers can be
+ shared, the RollingRandomAccessFileManagers can be
if the Manager is accessible.
For example, two web applications in a servlet
container can have their own configuration and safely write to the
same file if Log4j is in a ClassLoader that is common to both of them.
</p>
<p>
- A FastRollingFileAppender requires a
+ A RollingRandomAccessFileAppender requires a
<a href="#TriggeringPolicies">TriggeringPolicy</a>
and a
<a href="#RolloverStrategies">RolloverStrategy</a>.
@@ -438,12 +438,12 @@
while the RolloverStrategy defines how the rollover
should be done.
If no RolloverStrategy
- is configured, FastRollingFileAppender will
+ is configured, RollingRandomAccessFileAppender will
use the
<a href="#DefaultRolloverStrategy">DefaultRolloverStrategy</a>.
</p>
<p>
- File locking is not supported by the FastRollingFileAppender.
+ File locking is not supported by the RollingRandomAccessFileAppender.
</p>
<table>
<tr>
@@ -546,7 +546,7 @@
caller, instead. You must set this to <code>false</code> when wrapping this Appender in a
<a href="#FailoverAppender">FailoverAppender</a>.</td>
</tr>
- <caption align="top">FastRollingFileAppender Parameters</caption>
+ <caption align="top">RollingRandomAccessFileAppender Parameters</caption>
</table>
<a name="FRFA_TriggeringPolicies" />
<h4>Triggering Policies</h4>
@@ -562,7 +562,7 @@
</p>
<p>
- Below is a sample configuration that uses a FastRollingFileAppender
+ Below is a sample configuration that uses a RollingRandomAccessFileAppender
with both the time and size based
triggering policies, will create
up to 7 archives on the same day (1-7) that
@@ -575,7 +575,7 @@
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <FastRollingFile name="FastRollingFile" fileName="logs/app.log"
+ <RollingRandomAccessFile name="RollingRandomAccessFile" fileName="logs/app.log"
filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
@@ -584,11 +584,11 @@
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="250 MB"/>
</Policies>
- </FastRollingFile>
+ </RollingRandomAccessFile>
</appenders>
<loggers>
<root level="error">
- <appender-ref ref="FastRollingFile"/>
+ <appender-ref ref="RollingRandomAccessFile"/>
</root>
</loggers>
</configuration>]]></pre>
@@ -599,7 +599,7 @@
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <FastRollingFile name="FastRollingFile" fileName="logs/app.log"
+ <RollingRandomAccessFile name="RollingRandomAccessFile" fileName="logs/app.log"
filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
@@ -609,17 +609,17 @@
<SizeBasedTriggeringPolicy size="250 MB"/>
</Policies>
<DefaultRolloverStrategy max="20"/>
- </FastRollingFile>
+ </RollingRandomAccessFile>
</appenders>
<loggers>
<root level="error">
- <appender-ref ref="FastRollingFile"/>
+ <appender-ref ref="RollingRandomAccessFile"/>
</root>
</loggers>
</configuration>]]></pre>
</p>
<p>
- Below is a sample configuration that uses a FastRollingFileAppender
+ Below is a sample configuration that uses a RollingRandomAccessFileAppender
with both the time and size based
triggering policies, will create
up to 7 archives on the same day (1-7) that
@@ -634,7 +634,7 @@
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <FastRollingFile name="FastRollingFile" fileName="logs/app.log"
+ <RollingRandomAccessFile name="RollingRandomAccessFile" fileName="logs/app.log"
filePattern="logs/$${date:yyyy-MM}/app-%d{yyyy-MM-dd-HH}-%i.log.gz">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
@@ -643,11 +643,11 @@
<TimeBasedTriggeringPolicy interval="6" modulate="true"/>
<SizeBasedTriggeringPolicy size="250 MB"/>
</Policies>
- </FastRollingFile>
+ </RollingRandomAccessFile>
</appenders>
<loggers>
<root level="error">
- <appender-ref ref="FastRollingFile"/>
+ <appender-ref ref="RollingRandomAccessFile"/>
</root>
</loggers>
</configuration>]]></pre>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml?rev=1508130&r1=1508129&r2=1508130&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml Mon Jul 29 16:44:59 2013
@@ -55,7 +55,7 @@
do not need the disruptor jar on the classpath.)
</li>
<li>(For synchronous and asynchronous use)
- <b>Fast File Appenders</b>
+ <b>Random Access File Appenders</b>
are an alternative to Buffered File
Appenders. Under the hood, these
new appenders use a ByteBuffer + RandomAccessFile instead
@@ -64,7 +64,7 @@
These appenders can also be used
with synchronous loggers
and will give the same performance benefits.
- Fast File Appenders do not need the disruptor jar on the classpath.
+ Random Access File Appenders do not need the disruptor jar on the classpath.
</li>
</ul>
<a name="Trade-offs" />
@@ -154,15 +154,15 @@
<configuration status="WARN">
<appenders>
<!-- Async Loggers will auto-flush in batches, so switch off immediateFlush. -->
- <FastFile name="FastFile" fileName="async.log" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFile" fileName="async.log" immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %c{1.} [%t] %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<root level="info" includeLocation="false">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>]]></pre>
@@ -350,17 +350,17 @@
<configuration status="WARN">
<appenders>
<!-- Async Loggers will auto-flush in batches, so switch off immediateFlush. -->
- <FastFile name="FastFile" fileName="asyncWithLocation.log"
+ <RandomAccessFile name="RandomAccessFile" fileName="asyncWithLocation.log"
immediateFlush="false" append="false">
<PatternLayout>
<pattern>%d %p %class{1.} [%t] %location %m %ex%n</pattern>
</PatternLayout>
- </FastFile>
+ </RandomAccessFile>
</appenders>
<loggers>
<!-- pattern layout actually uses location, so we need to include it -->
<asyncLogger name="com.foo.Bar" level="trace" includeLocation="true">
- <appender-ref ref="FastFile"/>
+ <appender-ref ref="RandomAccessFile"/>
</asyncLogger>
<root level="info" includeLocation="true">
<appender-ref ref="FastFile"/>