You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/31 09:57:45 UTC
[01/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Repository: logging-log4j2
Updated Branches:
refs/heads/master aa3a9662e -> 78681540d
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7b9077c3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7b9077c3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7b9077c3
Branch: refs/heads/master
Commit: 7b9077c3bdb9b21b03a9e8bdfe8f55ddc5eeb506
Parents: 2faae9c 6ba91a3
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 16 17:06:17 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 16 17:06:17 2016 +1100
----------------------------------------------------------------------
log4j-1.2-api/pom.xml | 5 +
.../config/Log4j1ConfigurationFactory.java | 314 +++++++++++
.../config/Log4j1ConfigurationFactoryTest.java | 88 +++
...g4j-console-EnhancedPatternLayout.properties | 19 +
.../log4j-console-HtmlLayout.properties | 18 +
.../log4j-console-PatternLayout.properties | 19 +
.../log4j-console-SimpleLayout.properties | 18 +
.../log4j-console-TTCCLayout.properties | 18 +
.../log4j-console-XmlLayout.properties | 18 +
.../logging/log4j/message/ObjectMessage.java | 6 +-
.../logging/log4j/message/ReusableMessage.java | 4 +
.../log4j/message/ReusableMessageFactory.java | 123 +++++
.../log4j/message/ReusableObjectMessage.java | 94 ++++
.../message/ReusableParameterizedMessage.java | 249 ++++-----
.../ReusableParameterizedMessageFactory.java | 127 -----
.../log4j/message/ReusableSimpleMessage.java | 60 ++
.../logging/log4j/spi/AbstractLogger.java | 17 +-
.../logging/log4j/util/PropertiesUtil.java | 22 +
.../apache/logging/log4j/EventLoggerTest.java | 2 +-
.../apache/logging/log4j/LambdaLoggerTest.java | 3 +-
.../log4j/message/ParameterFormatterTest.java | 193 +++++++
.../message/ReusableObjectMessageTest.java | 122 ++++
.../ReusableParameterizedMessageTest.java | 59 ++
.../message/ReusableSimpleMessageTest.java | 122 ++++
.../logging/log4j/util/PropertiesUtilTest.java | 65 +++
.../resources/PropertiesUtilTest.properties | 29 +
log4j-core/pom.xml | 6 +
.../org/apache/logging/log4j/core/Appender.java | 8 +
.../org/apache/logging/log4j/core/Layout.java | 3 +-
.../logging/log4j/core/LoggerContext.java | 2 +
.../log4j/core/appender/AsyncAppender.java | 5 +-
.../log4j/core/appender/mom/JmsAppender.java | 10 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../appender/mom/jeromq/JeroMqAppender.java | 229 +-------
.../core/appender/mom/jeromq/JeroMqManager.java | 220 ++++++++
.../core/appender/mom/kafka/KafkaAppender.java | 12 +-
.../core/appender/mom/kafka/KafkaManager.java | 4 +
.../rolling/RollingRandomAccessFileManager.java | 2 +-
.../log4j/core/async/AsyncEventRouter.java | 7 +-
.../core/async/AsyncEventRouterFactory.java | 44 +-
.../logging/log4j/core/async/AsyncLogger.java | 165 +++---
.../log4j/core/async/AsyncLoggerConfig.java | 6 +-
.../core/async/AsyncLoggerConfigDelegate.java | 2 +
.../core/async/AsyncLoggerConfigDisruptor.java | 20 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 12 +-
.../core/async/DefaultAsyncEventRouter.java | 5 +-
.../core/async/DiscardingAsyncEventRouter.java | 35 +-
.../logging/log4j/core/async/EventRoute.java | 4 +-
.../log4j/core/async/RingBufferLogEvent.java | 27 +-
.../async/RingBufferLogEventTranslator.java | 53 +-
.../core/config/AbstractConfiguration.java | 1 +
.../log4j/core/config/ConfigurationAware.java | 33 ++
.../log4j/core/config/CronScheduledFuture.java | 12 +-
.../logging/log4j/core/config/LoggerConfig.java | 51 +-
.../builder/api/AppenderComponentBuilder.java | 9 +-
.../api/AppenderRefComponentBuilder.java | 9 +-
.../api/CompositeFilterComponentBuilder.java | 14 +-
.../builder/api/FilterableComponentBuilder.java | 34 ++
.../builder/api/LoggableComponentBuilder.java | 33 ++
.../builder/api/LoggerComponentBuilder.java | 16 +-
.../builder/api/RootLoggerComponentBuilder.java | 16 +-
.../core/config/builder/api/package-info.java | 2 +
.../config/builder/impl/BuiltConfiguration.java | 17 +-
.../impl/DefaultAppenderComponentBuilder.java | 2 +
.../DefaultAppenderRefComponentBuilder.java | 2 +
...DefaultComponentAndConfigurationBuilder.java | 2 +
.../builder/impl/DefaultComponentBuilder.java | 22 +-
.../DefaultCompositeFilterComponentBuilder.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 16 +-
.../DefaultCustomLevelComponentBuilder.java | 2 +-
.../impl/DefaultFilterComponentBuilder.java | 2 +-
.../impl/DefaultLayoutComponentBuilder.java | 2 +-
.../impl/DefaultLoggerComponentBuilder.java | 4 +-
.../impl/DefaultRootLoggerComponentBuilder.java | 4 +-
.../impl/DefaultScriptComponentBuilder.java | 2 +-
.../impl/DefaultScriptFileComponentBuilder.java | 2 +
.../core/config/builder/impl/package-info.java | 2 +
.../core/config/json/JsonConfiguration.java | 550 +++++++++----------
.../PropertiesConfigurationBuilder.java | 298 ++++++++++
.../PropertiesConfigurationFactory.java | 378 +------------
.../core/config/status/StatusConfiguration.java | 4 +-
.../log4j/core/config/xml/XmlConfiguration.java | 14 +-
.../log4j/core/filter/CompositeFilter.java | 76 +--
.../logging/log4j/core/impl/Log4jLogEvent.java | 16 +-
.../AbstractConfigurationAwareLookup.java | 35 ++
.../logging/log4j/core/lookup/Interpolator.java | 6 +-
.../logging/log4j/core/lookup/JndiLookup.java | 5 +-
.../logging/log4j/core/lookup/Log4jLookup.java | 60 +-
.../log4j/core/lookup/StrSubstitutor.java | 19 +-
.../logging/log4j/core/net/SmtpManager.java | 15 +-
.../log4j/core/net/SslSocketManager.java | 2 +-
.../pattern/EqualsReplacementConverter.java | 48 +-
.../logging/log4j/core/util/KeyValuePair.java | 3 -
.../log4j/core/util/ObjectArrayIterator.java | 179 ++++++
.../logging/log4j/core/util/StringEncoder.java | 2 +-
.../log4j/core/CustomLevelsWithFiltersTest.java | 8 +-
.../logging/log4j/core/GcFreeLoggingTest.java | 131 +++++
.../logging/log4j/core/LoggerUpdateTest.java | 15 +
.../appender/mom/jeromq/JeroMqAppenderTest.java | 12 +-
.../rolling/RollingAppenderSizeTest.java | 15 +-
.../core/async/AsyncEventRouterFactoryTest.java | 57 +-
.../core/async/DefaultAsyncEventRouterTest.java | 25 +-
.../async/DiscardingAsyncEventRouterTest.java | 79 +--
.../log4j/core/config/ConfigurationTest.java | 3 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../log4j/core/layout/PatternLayoutTest.java | 87 ++-
.../log4j/core/lookup/JndiLookupTest.java | 18 +
.../log4j/core/lookup/Log4jLookupTest.java | 32 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 16 +-
.../core/pattern/DatePatternConverterTest.java | 2 +-
.../pattern/EqualsReplacementConverterTest.java | 63 ++-
.../apache/logging/log4j/core/util/Compare.java | 134 -----
.../log4j/core/util/PropertiesUtilTest.java | 42 --
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../log4j/test/appender/AlwaysFailAppender.java | 11 +-
.../log4j/test/appender/DeadlockAppender.java | 13 +-
.../log4j/test/appender/FailOnceAppender.java | 13 +-
.../log4j/test/appender/InMemoryAppender.java | 2 -
.../log4j/test/appender/ListAppender.java | 6 +-
.../test/appender/UsesLoggingAppender.java | 22 +-
.../src/test/resources/log4j-routing.properties | 9 -
.../log4j-scriptFile-filters.properties | 8 -
.../src/test/resources/log4j-test1.properties | 58 ++
.../log4j2-properties-root-only.properties | 6 -
.../test/resources/log4j2-properties.properties | 9 -
.../appender/FlumeEmbeddedAppenderTest.java | 10 +-
log4j-jmx-gui/pom.xml | 4 +-
.../log4j/web/Log4jWebInitializerImpl.java | 5 +-
.../log4j/web/appender/ServletAppender.java | 4 +-
pom.xml | 8 +-
src/changes/changes.xml | 26 +-
src/site/xdoc/manual/async.xml | 8 +-
src/site/xdoc/manual/configuration.xml.vm | 52 +-
133 files changed, 3677 insertions(+), 2060 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b9077c3/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --cc log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index 0694973,244b8e7..f21c697
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@@ -26,9 -26,8 +26,9 @@@ import org.apache.logging.log4j.message
import org.apache.logging.log4j.message.FlowMessageFactory;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.MessageFactory;
+import org.apache.logging.log4j.message.MessageFactory2;
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
- import org.apache.logging.log4j.message.ReusableParameterizedMessageFactory;
+ import org.apache.logging.log4j.message.ReusableMessageFactory;
import org.apache.logging.log4j.message.StringFormattedMessage;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.LambdaUtil;
[40/50] logging-log4j2 git commit: LOG4J2-1278 removed ineffective
check if Object parameter is a lambda
Posted by rp...@apache.org.
LOG4J2-1278 removed ineffective check if Object parameter is a lambda
- removed ineffective check if Object parameter is a lambda: the java compiler will not see a lambda expression as an Object.
- Removing this check boosts performance: methods with unrolled varargs used to be slightly slower than the varargs methods, now they are slightly faster (not a massive difference, but still nice)
- fixed failing LambdaLoggerTest
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d5cbe125
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d5cbe125
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d5cbe125
Branch: refs/heads/master
Commit: d5cbe125b0fa24c4d347e4e121320c2cadca3cd5
Parents: 7485aac
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 00:28:43 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 00:28:43 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/spi/AbstractLogger.java | 35 ++++-------
.../apache/logging/log4j/util/LambdaUtil.java | 11 ----
.../apache/logging/log4j/LambdaLoggerTest.java | 62 ++++++++++----------
3 files changed, 42 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5cbe125/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index e04e01f..9edd513 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -1900,80 +1900,65 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0));
+ final Message msg = messageFactory.newMessage(message, p0);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1));
+ final Message msg = messageFactory.newMessage(message, p0, p1);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2, p3);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2, p3, p4);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
- LambdaUtil.maybeLambda(p5));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2, p3, p4, p5);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
- LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2, p3, p4, p5, p6);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
- LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
- LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7),
- LambdaUtil.maybeLambda(p8));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
- LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
- LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7),
- LambdaUtil.maybeLambda(p8), LambdaUtil.maybeLambda(p9));
+ final Message msg = messageFactory.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5cbe125/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
index 95dc265..33b0d2a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
@@ -91,15 +91,4 @@ public final class LambdaUtil {
final Object result = supplier.get();
return result instanceof Message ? (Message) result : messageFactory.newMessage(result);
}
-
- /**
- * If the specified object is a {@code Supplier} then returns the result of calling its {@link Supplier#get()}
- * method, otherwise returns the specified object itself.
- *
- * @param maybe the object to evaluate if it is a lambda, or return as is if it is not
- * @return the result of evaluating the specified lambda, or the specified object itself it not a lambda
- */
- public static Object maybeLambda(final Object maybe) {
- return maybe instanceof Supplier<?> ? ((Supplier<?>) maybe).get() : maybe;
- }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5cbe125/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
index c9f8e9a..06a5b62 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
@@ -201,6 +201,8 @@ public class LambdaLoggerTest {
final MySupplier supplier = new MySupplier();
final MySupplier supplier2 = new MySupplier();
+ final Supplier[] supplierArray1 = new Supplier[] {supplier};
+ final Supplier[] supplierArray2 = new Supplier[] {supplier, supplier2};
@Before
public void beforeEachTest() {
@@ -339,11 +341,11 @@ public class LambdaLoggerTest {
@Test
public void testDebugStringParamSupplier() {
- logger2.disable().debug("abc {}", supplier);
+ logger2.disable().debug("abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().debug("abc {}", supplier);
+ logger2.enable().debug("abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -354,11 +356,11 @@ public class LambdaLoggerTest {
@Test
public void testDebugMarkerStringParamSupplier() {
- logger2.disable().debug(marker, "abc {}", supplier);
+ logger2.disable().debug(marker, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().debug(marker, "abc {}", supplier);
+ logger2.enable().debug(marker, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -498,11 +500,11 @@ public class LambdaLoggerTest {
@Test
public void testErrorStringParamSupplier() {
- logger2.disable().error("abc {}", supplier);
+ logger2.disable().error("abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().error("abc {}", supplier);
+ logger2.enable().error("abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -513,11 +515,11 @@ public class LambdaLoggerTest {
@Test
public void testErrorMarkerStringParamSupplier() {
- logger2.disable().error(marker, "abc {}", supplier);
+ logger2.disable().error(marker, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().error(marker, "abc {}", supplier);
+ logger2.enable().error(marker, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -657,11 +659,11 @@ public class LambdaLoggerTest {
@Test
public void testFatalStringParamSupplier() {
- logger2.disable().fatal("abc {}", supplier);
+ logger2.disable().fatal("abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().fatal("abc {}", supplier);
+ logger2.enable().fatal("abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -672,12 +674,12 @@ public class LambdaLoggerTest {
@Test
public void testFatalStringParam2Suppliers() {
- logger2.disable().fatal("abc {}{}", supplier, supplier2);
+ logger2.disable().fatal("abc {}{}", supplierArray2);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
assertFalse(supplier2.invoked);
- logger2.enable().fatal("abc {}{}", supplier, supplier2);
+ logger2.enable().fatal("abc {}{}", supplierArray2);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
assertTrue(supplier2.invoked);
@@ -689,11 +691,11 @@ public class LambdaLoggerTest {
@Test
public void testFatalMarkerStringParamSupplier() {
- logger2.disable().fatal(marker, "abc {}", supplier);
+ logger2.disable().fatal(marker, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().fatal(marker, "abc {}", supplier);
+ logger2.enable().fatal(marker, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -833,11 +835,11 @@ public class LambdaLoggerTest {
@Test
public void testInfoStringParamSupplier() {
- logger2.disable().info("abc {}", supplier);
+ logger2.disable().info("abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().info("abc {}", supplier);
+ logger2.enable().info("abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -848,11 +850,11 @@ public class LambdaLoggerTest {
@Test
public void testInfoMarkerStringParamSupplier() {
- logger2.disable().info(marker, "abc {}", supplier);
+ logger2.disable().info(marker, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().info(marker, "abc {}", supplier);
+ logger2.enable().info(marker, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -992,11 +994,11 @@ public class LambdaLoggerTest {
@Test
public void testTraceStringParamSupplier() {
- logger2.disable().trace("abc {}", supplier);
+ logger2.disable().trace("abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().trace("abc {}", supplier);
+ logger2.enable().trace("abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -1007,11 +1009,11 @@ public class LambdaLoggerTest {
@Test
public void testTraceMarkerStringParamSupplier() {
- logger2.disable().trace(marker, "abc {}", supplier);
+ logger2.disable().trace(marker, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().trace(marker, "abc {}", supplier);
+ logger2.enable().trace(marker, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -1151,11 +1153,11 @@ public class LambdaLoggerTest {
@Test
public void testWarnStringParamSupplier() {
- logger2.disable().warn("abc {}", supplier);
+ logger2.disable().warn("abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().warn("abc {}", supplier);
+ logger2.enable().warn("abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -1166,11 +1168,11 @@ public class LambdaLoggerTest {
@Test
public void testWarnMarkerStringParamSupplier() {
- logger2.disable().warn(marker, "abc {}", supplier);
+ logger2.disable().warn(marker, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().warn(marker, "abc {}", supplier);
+ logger2.enable().warn(marker, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -1310,11 +1312,11 @@ public class LambdaLoggerTest {
@Test
public void testLogStringParamSupplier() {
- logger2.disable().log(Level.WARN, "abc {}", supplier);
+ logger2.disable().log(Level.WARN, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().log(Level.WARN, "abc {}", supplier);
+ logger2.enable().log(Level.WARN, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
@@ -1325,11 +1327,11 @@ public class LambdaLoggerTest {
@Test
public void testLogMarkerStringParamSupplier() {
- logger2.disable().log(Level.WARN, marker, "abc {}", supplier);
+ logger2.disable().log(Level.WARN, marker, "abc {}", supplierArray1);
assertTrue(logger2.list.isEmpty());
assertFalse(supplier.invoked);
- logger2.enable().log(Level.WARN, marker, "abc {}", supplier);
+ logger2.enable().log(Level.WARN, marker, "abc {}", supplierArray1);
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
[24/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0cda9c48
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0cda9c48
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0cda9c48
Branch: refs/heads/master
Commit: 0cda9c4837b54dee0277cdf93c814afa96ed318b
Parents: fbe63f5 13aadaa
Author: rpopma <rp...@apache.org>
Authored: Sat Mar 19 14:02:36 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Mar 19 14:02:36 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/LogManager.java | 4 +-
.../rolling/DefaultRolloverStrategy.java | 186 ++++++++++---------
.../logging/log4j/core/GcFreeLoggingTest.java | 8 +-
src/changes/changes.xml | 3 +
src/site/xdoc/manual/migration.xml | 24 ++-
5 files changed, 131 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0cda9c48/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java
----------------------------------------------------------------------
[11/50] logging-log4j2 git commit: LOG4J2-1278 ParameterizedMessage
constructor should have varargs parameter array instead of normal array
Posted by rp...@apache.org.
LOG4J2-1278 ParameterizedMessage constructor should have varargs parameter array instead of normal array
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/635c4e2e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/635c4e2e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/635c4e2e
Branch: refs/heads/master
Commit: 635c4e2ed68d2288b416c1f610900936c715bb7e
Parents: ca4295e
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:29:20 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:29:20 2016 +1100
----------------------------------------------------------------------
.../org/apache/logging/log4j/message/ParameterizedMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/635c4e2e/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
index fe22b02..897c311 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
@@ -107,7 +107,7 @@ public class ParameterizedMessage implements Message, StringBuilderFormattable {
* @param messagePattern the message pattern that to be checked for placeholders.
* @param arguments the argument array to be converted.
*/
- public ParameterizedMessage(final String messagePattern, final Object[] arguments) {
+ public ParameterizedMessage(final String messagePattern, final Object... arguments) {
this.argArray = arguments;
init(messagePattern);
}
[07/50] logging-log4j2 git commit: LOG4J2-1278 added explicit cast to
disambiguate which method is being called
Posted by rp...@apache.org.
LOG4J2-1278 added explicit cast to disambiguate which method is being called
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5d1c542a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5d1c542a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5d1c542a
Branch: refs/heads/master
Commit: 5d1c542a78751e259c5e06b1d43e35a3aa0129c8
Parents: 7db64d5
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:13:25 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:13:25 2016 +1100
----------------------------------------------------------------------
log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5d1c542a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
index 4f0c495..9b2705c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
@@ -416,7 +416,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
boolean filter(final Level level, final Marker marker, final String msg, final Throwable t) {
final Filter filter = config.getFilter();
if (filter != null) {
- final Filter.Result r = filter.filter(logger, level, marker, msg, t);
+ final Filter.Result r = filter.filter(logger, level, marker, (Object) msg, t);
if (r != Filter.Result.NEUTRAL) {
return r == Filter.Result.ACCEPT;
}
[03/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to AbstractLogger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to AbstractLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ec948a03
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ec948a03
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ec948a03
Branch: refs/heads/master
Commit: ec948a03b220a0fc0d43b862045405326c92dd48
Parents: b6ef293
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:09:04 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:09:04 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/spi/AbstractLogger.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ec948a03/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index f21c697..c7d8156 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -1939,7 +1939,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0)) {
final Message msg = newMessage(message, p0);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1948,7 +1948,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1)) {
final Message msg = newMessage(message, p0, p1);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1956,7 +1956,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2)) {
final Message msg = newMessage(message, p0, p1, p2);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1964,7 +1964,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3)) {
final Message msg = newMessage(message, p0, p1, p2, p3);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1973,7 +1973,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1982,7 +1982,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1991,7 +1991,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -2001,7 +2001,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -2011,7 +2011,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -2021,7 +2021,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8, final Object p9) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
[18/50] logging-log4j2 git commit: LOG4J2-1278 added test for more
than one lambda expression parameter
Posted by rp...@apache.org.
LOG4J2-1278 added test for more than one lambda expression parameter
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3b7299ae
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3b7299ae
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3b7299ae
Branch: refs/heads/master
Commit: 3b7299ae4b2b91e32f1cdf048a35dda0aaac1e75
Parents: 3e6d0ad
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 00:24:55 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 00:24:55 2016 +1100
----------------------------------------------------------------------
.../apache/logging/log4j/LambdaLoggerTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3b7299ae/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
index 0385c93..c9f8e9a 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
@@ -200,6 +200,7 @@ public class LambdaLoggerTest {
}
final MySupplier supplier = new MySupplier();
+ final MySupplier supplier2 = new MySupplier();
@Before
public void beforeEachTest() {
@@ -670,6 +671,23 @@ public class LambdaLoggerTest {
}
@Test
+ public void testFatalStringParam2Suppliers() {
+ logger2.disable().fatal("abc {}{}", supplier, supplier2);
+ assertTrue(logger2.list.isEmpty());
+ assertFalse(supplier.invoked);
+ assertFalse(supplier2.invoked);
+
+ logger2.enable().fatal("abc {}{}", supplier, supplier2);
+ assertEquals(1, logger2.list.size());
+ assertTrue(supplier.invoked);
+ assertTrue(supplier2.invoked);
+
+ final LogEvent event = logger2.list.get(0);
+ assertEquals(Level.FATAL, event.level);
+ assertEquals("abc HiHi", event.message.getFormattedMessage());
+ }
+
+ @Test
public void testFatalMarkerStringParamSupplier() {
logger2.disable().fatal(marker, "abc {}", supplier);
assertTrue(logger2.list.isEmpty());
[22/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a74bb8fd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a74bb8fd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a74bb8fd
Branch: refs/heads/master
Commit: a74bb8fd42dc998b1a72ea62da0300e064f390b0
Parents: a74a64c e39a2da
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 07:42:44 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 07:42:44 2016 +0900
----------------------------------------------------------------------
.../core/pattern/ClassNamePatternConverter.java | 2 +-
.../core/pattern/LoggerPatternConverter.java | 2 +-
.../log4j/core/pattern/NameAbbreviator.java | 53 +++++++++++---------
.../core/pattern/NamePatternConverter.java | 7 +--
.../log4j/core/pattern/NameAbbreviatorTest.java | 14 +++++-
src/changes/changes.xml | 3 ++
6 files changed, 52 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[21/50] logging-log4j2 git commit: LOG4J2-1278 experiment with more
parameters in simple method call
Posted by rp...@apache.org.
LOG4J2-1278 experiment with more parameters in simple method call
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a74a64cc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a74a64cc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a74a64cc
Branch: refs/heads/master
Commit: a74a64ccc86b83a94d13ea3f9518fa41ae5b1fb7
Parents: a76c056
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 01:08:08 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 01:08:08 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/perf/jmh/VarargsBenchmark.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a74a64cc/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java
index b9c910f..60d6abf 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java
@@ -56,21 +56,26 @@ public class VarargsBenchmark {
@BenchmarkMode(Mode.SampleTime)
@OutputTimeUnit(TimeUnit.NANOSECONDS)
public long varargParams() {
- return varargMethod("example {} {} {}", "one", "two", "three", "four");
+ return varargMethod("example {} {} {} {} {} {} {} {} {} {}", "one", "two", "three", "four", "five",
+ "six", "seven", "eight", "nine", "ten");
}
@Benchmark
@BenchmarkMode(Mode.SampleTime)
@OutputTimeUnit(TimeUnit.NANOSECONDS)
public long individualParams() {
- return individualArgMethod("example {} {} {}", "one", "two", "three");
+ return individualArgMethod("example {} {} {} {} {} {} {} {} {} {}", "one", "two", "three", "four", "five",
+ "six", "seven", "eight", "nine", "ten");
}
- private long varargMethod(String string, String... params) {
- return string.length() + params.length;
+ private long varargMethod(String string, String... p) {
+ return string.length() + p[0].length() + p[1].length() + p[2].length() + p[3].length() + p[4].length()
+ + p[5].length() + p[6].length() + p[7].length() + p[8].length() + p[9].length();
}
- private long individualArgMethod(String string, String param1, String param2, String param3) {
- return string.length() + param1.length();
+ private long individualArgMethod(String string, String p1, String p2, String p3, String p4, String p5, String p6,
+ String p7, String p8, String p9, String p10) {
+ return string.length() + p1.length() + p2.length() + p3.length() + p4.length() + p5.length() + p6.length()
+ + p7.length() + p8.length() + p9.length() + p10.length();
}
}
[32/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c6cc1c0b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c6cc1c0b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c6cc1c0b
Branch: refs/heads/master
Commit: c6cc1c0be88f717f8f25a7fe1ecef58053bc4b29
Parents: 5a873dd d90306f
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 25 01:27:44 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 25 01:27:44 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/AsyncLoggerDisruptor.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[41/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b175020c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b175020c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b175020c
Branch: refs/heads/master
Commit: b175020c7c914cb4c9ed22dc7eaa3872a7899b8b
Parents: d5cbe12 c5ea065
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 00:29:51 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 00:29:51 2016 +0900
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/util/ReflectionUtil.java | 2 +-
.../main/java/org/apache/logging/log4j/core/layout/GelfLayout.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[39/50] logging-log4j2 git commit: LOG4J2-1278 fix broken unit tests
Posted by rp...@apache.org.
LOG4J2-1278 fix broken unit tests
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7485aac7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7485aac7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7485aac7
Branch: refs/heads/master
Commit: 7485aac756dc164e5e73dbbadccf8b76466fdd01
Parents: bf12a5a
Author: rpopma <rp...@apache.org>
Authored: Mon Mar 28 21:49:20 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Mar 28 21:49:20 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/LoggerTest.java | 49 +++++++++++++-------
1 file changed, 33 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7485aac7/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index 3fe3b61..c4238fa 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -32,11 +32,13 @@ import java.util.Locale;
import org.apache.logging.log4j.message.EntryMessage;
import org.apache.logging.log4j.message.JsonMessage;
import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.message.MessageFactory;
import org.apache.logging.log4j.message.ObjectMessage;
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.message.SimpleMessageFactory;
import org.apache.logging.log4j.message.StringFormatterMessageFactory;
import org.apache.logging.log4j.message.StructuredDataMessage;
+import org.apache.logging.log4j.spi.MessageFactory2Adapter;
import org.apache.logging.log4j.util.Strings;
import org.apache.logging.log4j.util.Supplier;
import org.junit.Before;
@@ -232,8 +234,8 @@ public class LoggerTest {
final TestLogger altLogger = (TestLogger) LogManager.getFormatterLogger(getClass());
assertEquals(testLogger.getName(), altLogger.getName());
assertNotNull(testLogger);
- assertTrue(testLogger.getMessageFactory() instanceof StringFormatterMessageFactory);
- assertEquals(StringFormatterMessageFactory.INSTANCE, testLogger.getMessageFactory());
+ assertMessageFactoryInstanceOf(testLogger.getMessageFactory(), StringFormatterMessageFactory.class);
+ assertEqualMessageFactory(StringFormatterMessageFactory.INSTANCE, testLogger);
testLogger.debug("%,d", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0));
@@ -245,21 +247,28 @@ public class LoggerTest {
// The message factory is only used when the logger is created.
final TestLogger testLogger = (TestLogger) LogManager.getFormatterLogger(TestStringFormatterMessageFactory.class);
assertNotNull(testLogger);
- assertTrue(testLogger.getMessageFactory() instanceof StringFormatterMessageFactory);
- assertEquals(StringFormatterMessageFactory.INSTANCE, testLogger.getMessageFactory());
+ assertMessageFactoryInstanceOf(testLogger.getMessageFactory(), StringFormatterMessageFactory.class);
+ assertEqualMessageFactory(StringFormatterMessageFactory.INSTANCE, testLogger);
testLogger.debug("%,d", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0));
}
+ private static void assertMessageFactoryInstanceOf(MessageFactory factory, Class cls) {
+ if (factory instanceof MessageFactory2Adapter) {
+ factory = ((MessageFactory2Adapter) factory).getOriginal();
+ }
+ assertTrue(factory.getClass().isAssignableFrom(cls));
+ }
+
@Test
public void getFormatterLogger_Object() {
// The TestLogger logger was already created in an instance variable for this class.
// The message factory is only used when the logger is created.
final TestLogger testLogger = (TestLogger) LogManager.getFormatterLogger(new TestStringFormatterMessageFactory());
assertNotNull(testLogger);
- assertTrue(testLogger.getMessageFactory() instanceof StringFormatterMessageFactory);
- assertEquals(StringFormatterMessageFactory.INSTANCE, testLogger.getMessageFactory());
+ assertMessageFactoryInstanceOf(testLogger.getMessageFactory(), StringFormatterMessageFactory.class);
+ assertEqualMessageFactory(StringFormatterMessageFactory.INSTANCE, testLogger);
testLogger.debug("%,d", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0));
@@ -270,8 +279,8 @@ public class LoggerTest {
final StringFormatterMessageFactory messageFactory = StringFormatterMessageFactory.INSTANCE;
final TestLogger testLogger = (TestLogger) LogManager.getFormatterLogger("getLogger_String_StringFormatterMessageFactory");
assertNotNull(testLogger);
- assertTrue(testLogger.getMessageFactory() instanceof StringFormatterMessageFactory);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertMessageFactoryInstanceOf(testLogger.getMessageFactory(), StringFormatterMessageFactory.class);
+ assertEqualMessageFactory(messageFactory, testLogger);
testLogger.debug("%,d", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0));
@@ -285,7 +294,7 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger(TestParameterizedMessageFactory.class,
messageFactory);
assertNotNull(testLogger);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertEqualMessageFactory(messageFactory, testLogger);
testLogger.debug("{}", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(" DEBUG " + Integer.MAX_VALUE, testLogger.getEntries().get(0));
@@ -298,7 +307,7 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger(TestStringFormatterMessageFactory.class,
StringFormatterMessageFactory.INSTANCE);
assertNotNull(testLogger);
- assertEquals(StringFormatterMessageFactory.INSTANCE, testLogger.getMessageFactory());
+ assertEqualMessageFactory(StringFormatterMessageFactory.INSTANCE, testLogger);
testLogger.debug("%,d", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0));
@@ -312,12 +321,20 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger(new TestParameterizedMessageFactory(),
messageFactory);
assertNotNull(testLogger);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertEqualMessageFactory(messageFactory, testLogger);
testLogger.debug("{}", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(" DEBUG " + Integer.MAX_VALUE, testLogger.getEntries().get(0));
}
+ private void assertEqualMessageFactory(final MessageFactory messageFactory, final TestLogger testLogger) {
+ MessageFactory actual = testLogger.getMessageFactory();
+ if (actual instanceof MessageFactory2Adapter) {
+ actual = ((MessageFactory2Adapter) actual).getOriginal();
+ }
+ assertEquals(messageFactory, actual);
+ }
+
@Test
public void getLogger_Object_StringFormatterMessageFactory() {
// The TestLogger logger was already created in an instance variable for this class.
@@ -326,7 +343,7 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger(new TestStringFormatterMessageFactory(),
messageFactory);
assertNotNull(testLogger);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertEqualMessageFactory(messageFactory, testLogger);
testLogger.debug("%,d", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0));
@@ -338,7 +355,7 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger("getLogger_String_MessageFactoryMismatch",
messageFactory);
assertNotNull(testLogger);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertEqualMessageFactory(messageFactory, testLogger);
final TestLogger testLogger2 = (TestLogger) LogManager.getLogger("getLogger_String_MessageFactoryMismatch",
ParameterizedMessageFactory.INSTANCE);
assertNotNull(testLogger2);
@@ -356,7 +373,7 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger("getLogger_String_ParameterizedMessageFactory",
messageFactory);
assertNotNull(testLogger);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertEqualMessageFactory(messageFactory, testLogger);
testLogger.debug("{}", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(" DEBUG " + Integer.MAX_VALUE, testLogger.getEntries().get(0));
@@ -368,7 +385,7 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger("getLogger_String_StringFormatterMessageFactory",
messageFactory);
assertNotNull(testLogger);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertEqualMessageFactory(messageFactory, testLogger);
testLogger.debug("{} %,d {foo}", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(" DEBUG {} %,d {foo}", testLogger.getEntries().get(0));
@@ -380,7 +397,7 @@ public class LoggerTest {
final TestLogger testLogger = (TestLogger) LogManager.getLogger("getLogger_String_StringFormatterMessageFactory",
messageFactory);
assertNotNull(testLogger);
- assertEquals(messageFactory, testLogger.getMessageFactory());
+ assertEqualMessageFactory(messageFactory, testLogger);
testLogger.debug("%,d", Integer.MAX_VALUE);
assertEquals(1, testLogger.getEntries().size());
assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0));
[44/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b3218213
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b3218213
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b3218213
Branch: refs/heads/master
Commit: b321821341301eae1cc7787b3ea4d247c852daf8
Parents: 15b69bf 102090f
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 23:39:43 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 23:39:43 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/AsyncLogger.java | 16 ++--------------
.../log4j/core/async/RingBufferLogEvent.java | 3 ++-
src/changes/changes.xml | 3 +++
3 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[35/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/db1cb292
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/db1cb292
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/db1cb292
Branch: refs/heads/master
Commit: db1cb2921d15c30c250f2f6d207dbfacc591849f
Parents: e530c96 5c8acfb
Author: rpopma <rp...@apache.org>
Authored: Mon Mar 28 00:52:23 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Mar 28 00:52:23 2016 +0900
----------------------------------------------------------------------
.../log4j/perf/jmh/AsyncLoggersBenchmark.java | 68 +++++++++++++++++---
.../main/resources/perf-WithoutAnyAppender.xml | 12 ++++
2 files changed, 70 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[17/50] logging-log4j2 git commit: LOG4J2-1278 simplify and leverage
the new isEnabled and logIfEnabled methods with unrolled varargs. Also
support mixing lambdas with object parameters.
Posted by rp...@apache.org.
LOG4J2-1278 simplify and leverage the new isEnabled and logIfEnabled methods with unrolled varargs. Also support mixing lambdas with object parameters.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3e6d0ad4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3e6d0ad4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3e6d0ad4
Branch: refs/heads/master
Commit: 3e6d0ad492e28ca39e37344df4e5eb008ba6bea8
Parents: e08160e
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 00:24:08 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 00:24:08 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/spi/AbstractLogger.java | 988 +++++++------------
1 file changed, 351 insertions(+), 637 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e6d0ad4/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index c7d8156..1be9d87 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -360,183 +360,122 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void debug(final Marker marker, final String message, final Object p0) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2, p3);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2, p3, p4);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void debug(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.DEBUG, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.DEBUG, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
public void debug(final String message, final Object p0) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
-
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0);
}
@Override
public void debug(final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2, p3);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2, p3, p4);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void debug(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.DEBUG, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.DEBUG, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.DEBUG, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
/**
@@ -813,183 +752,119 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void error(final Marker marker, final String message, final Object p0) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2, p3);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2, p3, p4);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void error(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.ERROR, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.ERROR, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
public void error(final String message, final Object p0) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
-
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0);
}
@Override
public void error(final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3, p4);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void error(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.ERROR, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.ERROR, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
+ logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
@@ -1164,183 +1039,118 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void fatal(final Marker marker, final String message, final Object p0) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2, p3);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2, p3, p4);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6) {
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6, final Object p7) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void fatal(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.FATAL, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.FATAL, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
public void fatal(final String message, final Object p0) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
-
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0);
}
@Override
public void fatal(final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3, p4);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void fatal(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.FATAL, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.FATAL, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
@@ -1475,183 +1285,120 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void info(final Marker marker, final String message, final Object p0) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2, p3);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2, p3, p4);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6) {
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6, final Object p7) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void info(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.INFO, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.INFO, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
public void info(final String message, final Object p0) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
-
+ logIfEnabled(FQCN, Level.INFO, null, message, p0);
}
@Override
public void info(final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2, p3);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2, p3, p4);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void info(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.INFO, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.INFO, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.INFO, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
@@ -1848,183 +1595,119 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final Marker marker, final String message, final Object p0) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, marker, message, p0);
}
@Override
public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, marker, message, p0, p1);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2) {
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2, final Object p3) {
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2, p3);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2, final Object p3, final Object p4) {
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2, p3, p4);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2, final Object p3, final Object p4, final Object p5) {
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2, p3, p4, p5);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2, final Object p3, final Object p4, final Object p5, final Object p6) {
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
- public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
+ public void log(final Level level, final Marker marker, final String message, final Object p0, final Object p1,
+ final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- if (isEnabled(level, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, level, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
public void log(final Level level, final String message, final Object p0) {
- if (isEnabled(level, null, message, p0)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
-
+ logIfEnabled(FQCN, level, null, message, p0);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1) {
- if (isEnabled(level, null, message, p0, p1)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, null, message, p0, p1);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(level, null, message, p0, p1, p2)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(level, null, message, p0, p1, p2, p3)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2, p3);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(level, null, message, p0, p1, p2, p3, p4)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2, p3, p4);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7) {
- if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8) {
- if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8, final Object p9) {
- if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, level, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
+ logIfEnabled(FQCN, level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
@@ -2084,6 +1767,90 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0) {
+ if (isEnabled(level, marker, message, p0)) {
+ logMessage(fqcn, level, marker, message, p0);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1) {
+ if (isEnabled(level, marker, message, p0, p1)) {
+ logMessage(fqcn, level, marker, message, p0, p1);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2) {
+ if (isEnabled(level, marker, message, p0, p1, p2)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3) {
+ if (isEnabled(level, marker, message, p0, p1, p2, p3)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2, p3);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) {
+ if (isEnabled(level, marker, message, p0, p1, p2, p3, p4)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2, p3, p4);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) {
+ if (isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2, p3, p4, p5);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6) {
+ if (isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2, p3, p4, p5, p6);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7) {
+ if (isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7, final Object p8) {
+ if (isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7, final Object p8, final Object p9) {
+ if (isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
+ logMessage(fqcn, level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ }
+ }
+
+ @Override
+ public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final String message,
final Throwable t) {
if (isEnabled(level, marker, message, t)) {
logMessage(fqcn, level, marker, message, t);
@@ -2124,13 +1891,92 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
+ LambdaUtil.maybeLambda(p5));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
+ LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
+ LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7, final Object p8) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
+ LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7),
+ LambdaUtil.maybeLambda(p8));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
+ final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7, final Object p8, final Object p9) {
+ final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
+ LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7),
+ LambdaUtil.maybeLambda(p8), LambdaUtil.maybeLambda(p9));
+ logMessage(fqcn, level, marker, msg, msg.getThrowable());
+ }
+
+ protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Supplier<?>... paramSuppliers) {
final Message msg = messageFactory.newMessage(message, LambdaUtil.getAll(paramSuppliers));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
private Message newMessage(final String message, final Object p0) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0);
} else {
@@ -2139,7 +1985,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
}
private Message newMessage(final String message, final Object p0, final Object p1) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1);
} else {
@@ -2148,7 +1994,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
}
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2);
} else {
@@ -2157,7 +2003,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
}
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3);
} else {
@@ -2167,7 +2013,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4);
} else {
@@ -2177,7 +2023,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5);
} else {
@@ -2187,7 +2033,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6);
} else {
@@ -2197,7 +2043,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6, final Object p7) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
} else {
@@ -2207,7 +2053,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
} else {
@@ -2217,7 +2063,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
- final MessageFactory factory = getMessageFactory();
+ final MessageFactory factory = messageFactory;
if (factory instanceof MessageFactory2) {
return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
} else {
@@ -2393,183 +2239,117 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void trace(final Marker marker, final String message, final Object p0) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2, p3);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2, p3, p4);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6) {
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6, final Object p7) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void trace(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.TRACE, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.TRACE, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
public void trace(final String message, final Object p0) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
-
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0);
}
@Override
public void trace(final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2, p3);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2, p3, p4);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void trace(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.TRACE, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.TRACE, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
+ logIfEnabled(FQCN, Level.TRACE, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
@@ -2760,182 +2540,116 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void warn(final Marker marker, final String message, final Object p0) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2, p3);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2, p3, p4);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6) {
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6, final Object p7) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
- final Object p3, final Object p4, final Object p5,
- final Object p6, final Object p7, final Object p8) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ final Object p3, final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void warn(final Marker marker, final String message, final Object p0, final Object p1, final Object p2,
final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.WARN, marker, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.WARN, marker, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
@Override
public void warn(final String message, final Object p0) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
-
+ logIfEnabled(FQCN, Level.WARN, null, message, p0);
}
@Override
public void warn(final String message, final Object p0, final Object p1) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2, p3);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2, p3, p4);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2, p3, p4, p5);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2, p3, p4, p5, p6);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7) {
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2, p3, p4, p5, p6, p7);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6,
- final Object p7, final Object p8) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
}
@Override
public void warn(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8, final Object p9) {
- if (isEnabled(Level.WARN, null, message)) {
- final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- logMessage(FQCN, Level.WARN, null, msg, msg.getThrowable());
- }
+ logIfEnabled(FQCN, Level.WARN, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
}
[27/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/57e8ac9a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/57e8ac9a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/57e8ac9a
Branch: refs/heads/master
Commit: 57e8ac9affa4f7d9c8f0d3500e9b11672cea5c05
Parents: 3eefa3a b53e048
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 00:24:13 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 00:24:13 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/AsyncLogger.java | 31 +++----
.../log4j/core/async/RingBufferLogEvent.java | 39 ++++++---
.../async/RingBufferLogEventTranslator.java | 9 ++-
.../log4j/core/layout/AbstractStringLayout.java | 28 +++++--
.../logging/log4j/core/layout/GelfLayout.java | 85 +++++++++++++-------
.../log4j/core/layout/PatternLayout.java | 11 ---
.../logging/log4j/core/util/StringEncoder.java | 10 +--
.../core/async/perftest/SimplePerfTest.java | 12 ++-
.../log4j/core/async/perftest/SimplePerfTest.sh | 32 ++++++--
.../log4j/core/layout/GelfLayoutTest.java | 75 +++++++++--------
.../test/appender/EncodingListAppender.java | 64 +++++++++++++++
.../log4j/test/appender/ListAppender.java | 9 ++-
12 files changed, 276 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
[26/50] logging-log4j2 git commit: LOG4J2-1295 cast MessageFactory to
MessageFactory2 (or wrap in MessageFactory2Adapter) only once at
initialization time instead of for each message
Posted by rp...@apache.org.
LOG4J2-1295 cast MessageFactory to MessageFactory2 (or wrap in MessageFactory2Adapter) only once at initialization time instead of for each message
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3eefa3a8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3eefa3a8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3eefa3a8
Branch: refs/heads/master
Commit: 3eefa3a865ef7cbd9a14074d0c39c6967420e29b
Parents: fea7320
Author: rpopma <rp...@apache.org>
Authored: Sun Mar 20 19:29:10 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Mar 20 19:29:10 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/spi/AbstractLogger.java | 132 ++++---------------
.../log4j/spi/MessageFactory2Adapter.java | 108 +++++++++++++++
2 files changed, 130 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3eefa3a8/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index 1be9d87..e04e01f 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -93,7 +93,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
private static final String CATCHING = "Catching";
protected final String name;
- private final MessageFactory messageFactory;
+ private final MessageFactory2 messageFactory;
private final FlowMessageFactory flowMessageFactory;
/**
@@ -122,7 +122,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
*/
public AbstractLogger(final String name, final MessageFactory messageFactory) {
this.name = name;
- this.messageFactory = messageFactory == null ? createDefaultMessageFactory() : messageFactory;
+ this.messageFactory = messageFactory == null ? createDefaultMessageFactory() : narrow(messageFactory);
this.flowMessageFactory = createDefaultFlowMessageFactory();
}
@@ -222,14 +222,22 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
}
}
- private static MessageFactory createDefaultMessageFactory() {
+ private static MessageFactory2 createDefaultMessageFactory() {
try {
- return DEFAULT_MESSAGE_FACTORY_CLASS.newInstance();
+ final MessageFactory result = DEFAULT_MESSAGE_FACTORY_CLASS.newInstance();
+ return narrow(result);
} catch (final InstantiationException | IllegalAccessException e) {
throw new IllegalStateException(e);
}
}
+ private static MessageFactory2 narrow(final MessageFactory result) {
+ if (result instanceof MessageFactory2) {
+ return (MessageFactory2) result;
+ }
+ return new MessageFactory2Adapter(result);
+ }
+
private static FlowMessageFactory createDefaultFlowMessageFactory() {
try {
return DEFAULT_FLOW_MESSAGE_FACTORY_CLASS.newInstance();
@@ -1892,40 +1900,40 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0));
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1));
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
LambdaUtil.maybeLambda(p5));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
@@ -1934,7 +1942,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
@@ -1943,7 +1951,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7));
logMessage(fqcn, level, marker, msg, msg.getThrowable());
@@ -1952,7 +1960,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7),
LambdaUtil.maybeLambda(p8));
@@ -1962,7 +1970,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,
final Object p0, final Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
final Object p6, final Object p7, final Object p8, final Object p9) {
- final Message msg = newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
+ final Message msg = messageFactory.newMessage(message, LambdaUtil.maybeLambda(p0), LambdaUtil.maybeLambda(p1),
LambdaUtil.maybeLambda(p2), LambdaUtil.maybeLambda(p3), LambdaUtil.maybeLambda(p4),
LambdaUtil.maybeLambda(p5), LambdaUtil.maybeLambda(p6), LambdaUtil.maybeLambda(p7),
LambdaUtil.maybeLambda(p8), LambdaUtil.maybeLambda(p9));
@@ -1975,102 +1983,6 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
logMessage(fqcn, level, marker, msg, msg.getThrowable());
}
- private Message newMessage(final String message, final Object p0) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0);
- } else {
- return factory.newMessage(message, p0);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1);
- } else {
- return factory.newMessage(message, p0, p1);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2);
- } else {
- return factory.newMessage(message, p0, p1, p2);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3);
- } else {
- return factory.newMessage(message, p0, p1, p2, p3);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4);
- } else {
- return factory.newMessage(message, p0, p1, p2, p3, p4);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5);
- } else {
- return factory.newMessage(message, p0, p1, p2, p3, p4, p5);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- } else {
- return factory.newMessage(message, p0, p1, p2, p3, p4, p5, p6);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6, final Object p7) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- } else {
- return factory.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- } else {
- return factory.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
- }
- }
-
- private Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
- final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
- final MessageFactory factory = messageFactory;
- if (factory instanceof MessageFactory2) {
- return ((MessageFactory2) factory).newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- } else {
- return factory.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
- }
- }
-
@Override
public void printf(final Level level, final Marker marker, final String format, final Object... params) {
if (isEnabled(level, marker, format, params)) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3eefa3a8/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
new file mode 100644
index 0000000..d516dbf
--- /dev/null
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.spi;
+
+import java.util.Objects;
+
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.message.MessageFactory;
+import org.apache.logging.log4j.message.MessageFactory2;
+
+/**
+ * Adapts a legacy MessageFactory to the new MessageFactory2 interface.
+ *
+ * @since 2.6
+ */
+public class MessageFactory2Adapter implements MessageFactory2 {
+ private final MessageFactory wrapped;
+
+ public MessageFactory2Adapter(final MessageFactory wrapped) {
+ this.wrapped = Objects.requireNonNull(wrapped);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0) {
+ return wrapped.newMessage(message, p0);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1) {
+ return wrapped.newMessage(message, p0, p1);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) {
+ return wrapped.newMessage(message, p0, p1, p2);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2,
+ final Object p3) {
+ return wrapped.newMessage(message, p0, p1, p2, p3);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return wrapped.newMessage(message, p0, p1, p2, p3, p4);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return wrapped.newMessage(message, p0, p1, p2, p3, p4, p5);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return wrapped.newMessage(message, p0, p1, p2, p3, p4, p5, p6);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6, final Object p7) {
+ return wrapped.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ return wrapped.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
+ return wrapped.newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ }
+
+ @Override
+ public Message newMessage(final Object message) {
+ return wrapped.newMessage(message);
+ }
+
+ @Override
+ public Message newMessage(final String message) {
+ return wrapped.newMessage(message);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object... params) {
+ return wrapped.newMessage(message, params);
+ }
+}
[13/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to SLF4JLogger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to SLF4JLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/65116feb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/65116feb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/65116feb
Branch: refs/heads/master
Commit: 65116feb187a31b038036493415c5d18c119b8b6
Parents: b5f12f9
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:38:03 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:38:03 2016 +1100
----------------------------------------------------------------------
.../org/apache/logging/slf4j/SLF4JLogger.java | 72 +++++++++++++++++++-
1 file changed, 70 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65116feb/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
index 34f3bef..7ed81ed 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
@@ -45,7 +45,7 @@ public class SLF4JLogger extends AbstractLogger {
this.logger = logger;
this.locationAwareLogger = logger instanceof LocationAwareLogger ? (LocationAwareLogger) logger : null;
}
-
+
private int convertLevel(final Level level) {
switch (level.getStandardLevel()) {
case DEBUG :
@@ -84,7 +84,7 @@ public class SLF4JLogger extends AbstractLogger {
// Option: return Level.ALL;
return Level.OFF;
}
-
+
public org.slf4j.Logger getLogger() {
return locationAwareLogger != null ? locationAwareLogger : logger;
}
@@ -127,6 +127,74 @@ public class SLF4JLogger extends AbstractLogger {
}
@Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return isEnabledFor(level, marker);
+ }
+
+ @Override
public boolean isEnabled(final Level level, final Marker marker, final String data, final Throwable t) {
return isEnabledFor(level, marker);
}
[29/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c9d274db
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c9d274db
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c9d274db
Branch: refs/heads/master
Commit: c9d274db332a7963f1b2152a7848913625d03498
Parents: df1ed3e 11ab37b
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 01:24:39 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 01:24:39 2016 +0900
----------------------------------------------------------------------
.../log4j/core/async/RingBufferLogEvent.java | 26 +++++++----------
.../log4j/core/layout/TextEncoderHelper.java | 30 ++++++++++++++++++++
2 files changed, 41 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[47/50] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge branch 'master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8fa9284c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8fa9284c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8fa9284c
Branch: refs/heads/master
Commit: 8fa9284c81d6cebf8f07e18cf1c995c3a23c216e
Parents: fed3446 75e104f
Author: Mikael Ståldal <mi...@magine.com>
Authored: Wed Mar 30 17:56:35 2016 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Wed Mar 30 17:56:35 2016 +0200
----------------------------------------------------------------------
log4j-core/src/test/resources/gcFreeLogging.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[25/50] logging-log4j2 git commit: SimplePerfTest: avoid
Thread.sleep() during perf tests since it skews the result
Posted by rp...@apache.org.
SimplePerfTest: avoid Thread.sleep() during perf tests since it skews the result
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fea7320a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fea7320a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fea7320a
Branch: refs/heads/master
Commit: fea7320a12ae62b2623306f6079f3ef0bed913d8
Parents: 0cda9c4
Author: rpopma <rp...@apache.org>
Authored: Sun Mar 20 19:26:57 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Mar 20 19:26:57 2016 +0900
----------------------------------------------------------------------
.../apache/logging/log4j/core/async/perftest/SimplePerfTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fea7320a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java
index d9d460b..6d959c2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java
@@ -52,7 +52,6 @@ public class SimplePerfTest {
System.out.printf("Warmup: Throughput: %,d ops/s%n", opsPerSec);
total += opsPerSec;
count++;
- Thread.sleep(1000);// drain buffer
} while (System.currentTimeMillis() < end);
System.out.printf("Average warmup throughput: %,d ops/s%n", total/count);
@@ -63,7 +62,6 @@ public class SimplePerfTest {
loop(logger, ITERATIONS);
long endNanos = System.nanoTime();
durationNanos[i] = endNanos - startNanos;
- Thread.sleep(1000);// drain buffer
}
total = 0;
for (int i = 0; i < COUNT; i++) {
[37/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e6300b02
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e6300b02
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e6300b02
Branch: refs/heads/master
Commit: e6300b025c20dc7d03991e3fe3f0cd583d6420d5
Parents: febd70e 7ed0990
Author: rpopma <rp...@apache.org>
Authored: Mon Mar 28 21:07:00 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Mar 28 21:07:00 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/message/ParameterizedMessage.java | 10 +++++-----
.../log4j/message/ReusableParameterizedMessage.java | 7 +++----
.../log4j/message/ReusableParameterizedMessageTest.java | 6 +++++-
3 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e6300b02/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
----------------------------------------------------------------------
[12/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to test Loggers
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to test Loggers
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b5f12f9a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b5f12f9a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b5f12f9a
Branch: refs/heads/master
Commit: b5f12f9ac48cc3c3b6007b7cd6b8657a2a5db9e3
Parents: 635c4e2e
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:37:42 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:37:42 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/AbstractLoggerTest.java | 69 ++++++++++++++++++++
.../apache/logging/log4j/LambdaLoggerTest.java | 68 +++++++++++++++++++
.../org/apache/logging/log4j/TestLogger.java | 68 +++++++++++++++++++
3 files changed, 205 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b5f12f9a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
index 857877f..5a416c7 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
@@ -169,6 +169,75 @@ public class AbstractLoggerTest extends AbstractLogger {
}
@Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2, p3), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2, p3, p4), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8), null);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return isEnabled(level, marker, new ParameterizedMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9),
+ null);
+ }
+
+ @Override
public boolean isEnabled(final Level level, final Marker marker, final String data, final Throwable t) {
return isEnabled(level, marker, new SimpleMessage(data), t);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b5f12f9a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
index 9b4fcf1..0385c93 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
@@ -83,6 +83,74 @@ public class LambdaLoggerTest {
}
@Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return enabled;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return enabled;
+ }
+
+ @Override
public void logMessage(final String fqcn, final Level level, final Marker marker, final Message message, final Throwable t) {
list.add(new LogEvent(fqcn, level, marker, message, t));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b5f12f9a/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java b/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
index 22f0d21..2024831 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
@@ -101,6 +101,74 @@ public class TestLogger extends AbstractLogger {
}
@Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return true;
+ }
+
+ @Override
public boolean isEnabled(final Level level, final Marker marker, final Object msg, final Throwable t) {
return true;
}
[02/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to ReusableMessageFactory
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to ReusableMessageFactory
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b6ef2932
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b6ef2932
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b6ef2932
Branch: refs/heads/master
Commit: b6ef29324c5d446cbc4c24063ca85048ef48d0ed
Parents: 7b9077c
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 16 17:09:23 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 16 17:09:23 2016 +1100
----------------------------------------------------------------------
.../log4j/message/ReusableMessageFactory.java | 59 +++++++++++++++++++-
1 file changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6ef2932/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
index 85f2dea..706e31d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
* @since 2.6
*/
@PerformanceSensitive("allocation")
-public final class ReusableMessageFactory implements MessageFactory, Serializable {
+public final class ReusableMessageFactory implements MessageFactory2, Serializable {
/**
* Instance of ReusableMessageFactory..
@@ -90,6 +90,63 @@ public final class ReusableMessageFactory implements MessageFactory, Serializabl
return getParameterized().set(message, params);
}
+ @Override
+ public Message newMessage(final String message, final Object p0) {
+ return getParameterized().set(message, p0);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1) {
+ return getParameterized().set(message, p0, p1);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2) {
+ return getParameterized().set(message, p0, p1, p2);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2,
+ final Object p3) {
+ return getParameterized().set(message, p0, p1, p2, p3);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return getParameterized().set(message, p0, p1, p2, p3, p4);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return getParameterized().set(message, p0, p1, p2, p3, p4, p5);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return getParameterized().set(message, p0, p1, p2, p3, p4, p5, p6);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6, final Object p7) {
+ return getParameterized().set(message, p0, p1, p2, p3, p4, p5, p6, p7);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8) {
+ return getParameterized().set(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ }
+
+ @Override
+ public Message newMessage(final String message, final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
+ return getParameterized().set(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ }
+
/**
* Creates {@link ReusableSimpleMessage} instances.
*
[19/50] logging-log4j2 git commit: LOG4J2-1278 added explicit casts
to filter tests to disambiguate the target method
Posted by rp...@apache.org.
LOG4J2-1278 added explicit casts to filter tests to disambiguate the target method
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7a5f0e61
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7a5f0e61
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7a5f0e61
Branch: refs/heads/master
Commit: 7a5f0e61aebd1ffaf93f1ccd5d1209d055b038ee
Parents: 3b7299a
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 00:26:02 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 00:26:02 2016 +1100
----------------------------------------------------------------------
.../core/filter/DynamicThresholdFilterTest.java | 4 ++--
.../log4j/core/filter/LevelRangeFilterTest.java | 4 ++--
.../logging/log4j/core/filter/MarkerFilterTest.java | 6 +++---
.../logging/log4j/core/filter/RegexFilterTest.java | 11 ++++++-----
.../core/filter/ThreadContextMapFilterTest.java | 16 ++++++++--------
.../log4j/core/filter/ThresholdFilterTest.java | 4 ++--
.../logging/log4j/core/filter/TimeFilterTest.java | 2 +-
7 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a5f0e61/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
index 61a9a46..52d866b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
@@ -60,8 +60,8 @@ public class DynamicThresholdFilterTest {
null);
filter.start();
assertTrue(filter.isStarted());
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null));
ThreadContext.clearMap();
ThreadContext.put("userid", "JohnDoe");
ThreadContext.put("organization", "apache");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a5f0e61/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
index bcbe577..4deb468 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
@@ -35,8 +35,8 @@ public class LevelRangeFilterTest {
final LevelRangeFilter filter = LevelRangeFilter.createFilter(Level.ERROR, Level.INFO, null, null);
filter.start();
assertTrue(filter.isStarted());
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null));
LogEvent event = Log4jLogEvent.newBuilder() //
.setLevel(Level.DEBUG) //
.setMessage(new SimpleMessage("Test")) //
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a5f0e61/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java
index a7b77b1..1850e77 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java
@@ -42,9 +42,9 @@ public class MarkerFilterTest {
MarkerFilter filter = MarkerFilter.createFilter("Parent", null, null);
filter.start();
assertTrue(filter.isStarted());
- assertSame(Filter.Result.DENY, filter.filter(null, null, stranger, null, (Throwable) null));
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, null, child, null, (Throwable) null));
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, null, grandChild, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, null, stranger, (Object) null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, null, child, (Object) null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, null, grandChild, (Object) null, (Throwable) null));
filter.stop();
LogEvent event = Log4jLogEvent.newBuilder() //
.setMarker(grandChild) //
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a5f0e61/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java
index 01d3a32..c48edbe 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java
@@ -48,8 +48,9 @@ public class RegexFilterTest {
filter.start();
assertTrue(filter.isStarted());
assertSame(Filter.Result.NEUTRAL,
- filter.filter(null, Level.DEBUG, null, "This is a test message", (Throwable) null));
- assertSame(Filter.Result.DENY, filter.filter(null, Level.ERROR, null, "This is not a test", (Throwable) null));
+ filter.filter(null, Level.DEBUG, null, (Object) "This is a test message", (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.ERROR, null, (Object) "This is not a test",
+ (Throwable) null));
LogEvent event = Log4jLogEvent.newBuilder() //
.setLevel(Level.DEBUG) //
.setMessage(new SimpleMessage("Another test message")) //
@@ -70,8 +71,8 @@ public class RegexFilterTest {
final String multiLine = "test multi line matches\nsome more lines";
final RegexFilter filter = RegexFilter.createFilter(".*line.*", new String[] { "DOTALL", "COMMENTS" }, false,
Filter.Result.DENY, Filter.Result.ACCEPT);
- final Result singleLineResult = filter.filter(null, null, null, singleLine, (Throwable) null);
- final Result multiLineResult = filter.filter(null, null, null, multiLine, (Throwable) null);
+ final Result singleLineResult = filter.filter(null, null, null, (Object) singleLine, (Throwable) null);
+ final Result multiLineResult = filter.filter(null, null, null, (Object) multiLine, (Throwable) null);
assertThat(singleLineResult, equalTo(Result.DENY));
assertThat(multiLineResult, equalTo(Result.DENY));
}
@@ -81,7 +82,7 @@ public class RegexFilterTest {
final RegexFilter filter = RegexFilter.createFilter(".* test .*", null, false, null, null);
filter.start();
assertTrue(filter.isStarted());
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (String) null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Message) null, (Throwable) null));
assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Object[]) null));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a5f0e61/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
index 156ed33..546ef30 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
@@ -39,29 +39,29 @@ public class ThreadContextMapFilterTest {
ThreadContextMapFilter filter = ThreadContextMapFilter.createFilter(pairs, "and", null, null);
filter.start();
assertTrue(filter.isStarted());
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
ThreadContext.remove("userid");
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
ThreadContext.put("userid", "JohnDoe");
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null));
ThreadContext.put("organization", "ASF");
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
ThreadContext.clearMap();
filter = ThreadContextMapFilter.createFilter(pairs, "or", null, null);
filter.start();
assertTrue(filter.isStarted());
ThreadContext.put("userid", "testuser");
ThreadContext.put("organization", "Apache");
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
ThreadContext.put("organization", "ASF");
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
ThreadContext.remove("organization");
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
final KeyValuePair[] single = new KeyValuePair[] {new KeyValuePair("userid", "testuser")};
filter = ThreadContextMapFilter.createFilter(single, null, null, null);
filter.start();
assertTrue(filter.isStarted());
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
ThreadContext.clearMap();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a5f0e61/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java
index 9a71208..5ae7d52 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java
@@ -35,8 +35,8 @@ public class ThresholdFilterTest {
final ThresholdFilter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);
filter.start();
assertTrue(filter.isStarted());
- assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, null, (Throwable) null));
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, null, (Throwable) null));
+ assertSame(Filter.Result.DENY, filter.filter(null, Level.DEBUG, null, (Object) null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null));
LogEvent event = Log4jLogEvent.newBuilder() //
.setLevel(Level.DEBUG) //
.setMessage(new SimpleMessage("Test")) //
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a5f0e61/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java
index d2e5be8..e39d7db 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java
@@ -41,7 +41,7 @@ public class TimeFilterTest {
cal.set(Calendar.HOUR_OF_DAY, 2);
long tod = cal.getTimeInMillis();
LogEvent event = Log4jLogEvent.newBuilder().setTimeMillis(tod).build();
- assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, null, (Throwable) null));
+ assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null));
assertSame(Filter.Result.NEUTRAL, filter.filter(event));
cal.roll(Calendar.DAY_OF_MONTH, true);
tod = cal.getTimeInMillis();
[45/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d3b44f46
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d3b44f46
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d3b44f46
Branch: refs/heads/master
Commit: d3b44f462e73765575fe1fce0e0a31fc245e7358
Parents: b321821 cf919cb
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 31 00:29:51 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 31 00:29:51 2016 +0900
----------------------------------------------------------------------
.../core/async/AsyncLoggerTimestampMessageTest.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[38/50] logging-log4j2 git commit: LOG4J2-1278 fix broken unit tests
Posted by rp...@apache.org.
LOG4J2-1278 fix broken unit tests
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bf12a5a4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bf12a5a4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bf12a5a4
Branch: refs/heads/master
Commit: bf12a5a4cd5390bd1f6e2278304f864d25b6e2bf
Parents: e6300b0
Author: rpopma <rp...@apache.org>
Authored: Mon Mar 28 21:34:30 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Mar 28 21:34:30 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/spi/MessageFactory2Adapter.java | 4 ++++
.../java/org/apache/logging/log4j/AbstractLoggerTest.java | 3 ++-
.../test/java/org/apache/logging/log4j/core/LoggerTest.java | 7 ++++++-
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bf12a5a4/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
index d516dbf..2581b6c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
@@ -34,6 +34,10 @@ public class MessageFactory2Adapter implements MessageFactory2 {
this.wrapped = Objects.requireNonNull(wrapped);
}
+ public MessageFactory getOriginal() {
+ return wrapped;
+ }
+
@Override
public Message newMessage(final String message, final Object p0) {
return wrapped.newMessage(message, p0);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bf12a5a4/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
index 5a416c7..616772f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.MessageFactory2Adapter;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class AbstractLoggerTest extends AbstractLogger {
modifierField.setAccessible(true);
modifierField.setInt(field, field.getModifiers() &~ Modifier.FINAL); // make non-private
- field.set(this, ParameterizedMessageFactory.INSTANCE);
+ field.set(this, new MessageFactory2Adapter(ParameterizedMessageFactory.INSTANCE));
}
private static class LogEvent {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bf12a5a4/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
index fbdaf86..7ba6a89 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
@@ -45,6 +45,7 @@ import org.apache.logging.log4j.message.ReusableParameterizedMessage;
import org.apache.logging.log4j.message.StringFormatterMessageFactory;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.MessageFactory2Adapter;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.Before;
import org.junit.Rule;
@@ -289,7 +290,11 @@ public class LoggerTest {
if (messageFactory1 == null) {
assertEquals(AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS, testLogger1.getMessageFactory().getClass());
} else {
- assertEquals(messageFactory1, testLogger1.getMessageFactory());
+ MessageFactory actual = testLogger1.getMessageFactory();
+ if (actual instanceof MessageFactory2Adapter) {
+ actual = ((MessageFactory2Adapter) actual).getOriginal();
+ }
+ assertEquals(messageFactory1, actual);
}
}
[09/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to SimpleLogger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to SimpleLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8d8bba15
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8d8bba15
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8d8bba15
Branch: refs/heads/master
Commit: 8d8bba158fb6fa87bd96d4d6d31b1d39cb24afc4
Parents: 24551fb
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:23:37 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:23:37 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/simple/SimpleLogger.java | 68 ++++++++++++++++++++
1 file changed, 68 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8d8bba15/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
index 76dc6c4..aea1ff8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
@@ -121,6 +121,74 @@ public class SimpleLogger extends AbstractLogger {
}
@Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
+ public boolean isEnabled(final Level testLevel, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return this.level.intLevel() >= testLevel.intLevel();
+ }
+
+ @Override
public boolean isEnabled(final Level testLevel, final Marker marker, final String msg, final Throwable t) {
return this.level.intLevel() >= testLevel.intLevel();
}
[43/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/15b69bf9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/15b69bf9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/15b69bf9
Branch: refs/heads/master
Commit: 15b69bf96798fe823eb9e0000a32d83435e8b8ed
Parents: eae04d2 86f9ae3
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 02:11:11 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 02:11:11 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/layout/CsvParameterLayoutTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[34/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e530c969
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e530c969
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e530c969
Branch: refs/heads/master
Commit: e530c9696b9deb58968cafa5ed4753366f64d559
Parents: fa71934 abbfb09
Author: rpopma <rp...@apache.org>
Authored: Sun Mar 27 23:52:53 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Mar 27 23:52:53 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/MarkerManager.java | 11 +-
.../apache/logging/log4j/message/Message.java | 13 ++
.../logging/log4j/message/ObjectMessage.java | 4 +-
.../log4j/message/ParameterFormatter.java | 4 +-
.../logging/log4j/message/ReusableMessage.java | 4 +-
.../log4j/message/ReusableObjectMessage.java | 4 +-
.../log4j/simple/SimpleLoggerContext.java | 24 +--
.../logging/log4j/spi/LoggerContextKey.java | 4 +-
.../logging/log4j/spi/LoggerRegistry.java | 182 +++++++++++++++++++
.../logging/log4j/core/LoggerContext.java | 27 ++-
.../core/async/perftest/SimpleLatencyTest.java | 87 +++++++++
.../log4j/taglib/Log4jTaglibLoggerContext.java | 28 ++-
.../logging/slf4j/SLF4JLoggerContext.java | 32 ++--
src/changes/changes.xml | 6 +
src/site/xdoc/manual/garbagefree.xml | 133 ++++++++++++++
15 files changed, 489 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
[04/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to ExtendedLogger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to ExtendedLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/48189cc1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/48189cc1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/48189cc1
Branch: refs/heads/master
Commit: 48189cc1d7644dee3b466b615b1c9b67d04a83f1
Parents: ec948a0
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:09:32 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:09:32 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/spi/ExtendedLogger.java | 189 +++++++++++++++++--
1 file changed, 175 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/48189cc1/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
index 2bb2ea8..08b2e7e 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
@@ -31,7 +31,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The Message.
@@ -42,7 +42,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -53,7 +53,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -64,7 +64,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determine if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -74,7 +74,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -84,8 +84,169 @@ public interface ExtendedLogger extends Logger {
boolean isEnabled(Level level, Marker marker, String message, Object... params);
/**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8, Object p9);
+
+ /**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -97,7 +258,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -109,7 +270,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -121,7 +282,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -132,7 +293,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -145,7 +306,7 @@ public interface ExtendedLogger extends Logger {
/**
* Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -157,7 +318,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message which is only to be constructed if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -171,7 +332,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message whose parameters are only to be constructed if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -183,7 +344,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message which is only to be constructed if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
[42/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/eae04d26
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/eae04d26
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/eae04d26
Branch: refs/heads/master
Commit: eae04d269af2751889cb3005a4f94ace56781aab
Parents: b175020 591c584
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 02:04:28 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 02:04:28 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/message/ParameterizedMessage.java | 2 +-
.../logging/log4j/message/ReusableParameterizedMessage.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/eae04d26/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
----------------------------------------------------------------------
[10/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to StatusLogger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to StatusLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ca4295e8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ca4295e8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ca4295e8
Branch: refs/heads/master
Commit: ca4295e8d43da092378223d1e1e740ad6da61fed
Parents: 8d8bba1
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:23:53 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:23:53 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/status/StatusLogger.java | 82 ++++++++++++++++++--
1 file changed, 75 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ca4295e8/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
index 21a7f2a..46eb4f8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
@@ -89,7 +89,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Retrieve the StatusLogger.
- *
+ *
* @return The StatusLogger.
*/
public static StatusLogger getLogger() {
@@ -102,7 +102,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Registers a new listener.
- *
+ *
* @param listener The StatusListener to register.
*/
public void registerListener(final StatusListener listener) {
@@ -120,7 +120,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Removes a StatusListener.
- *
+ *
* @param listener The StatusListener to remove.
*/
public void removeListener(final StatusListener listener) {
@@ -143,7 +143,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Returns a thread safe Iterable for the StatusListener.
- *
+ *
* @return An Iterable for the list of StatusListeners.
*/
public Iterable<StatusListener> getListeners() {
@@ -177,7 +177,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Returns a List of all events as StatusData objects.
- *
+ *
* @return The list of StatusData objects.
*/
public List<StatusData> getStatusData() {
@@ -208,7 +208,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Adds an event.
- *
+ *
* @param marker The Marker
* @param fqcn The fully qualified class name of the <b>caller</b>
* @param level The logging level
@@ -275,6 +275,74 @@ public final class StatusLogger extends AbstractLogger {
}
@Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return isEnabled(level, marker);
+ }
+
+ @Override
public boolean isEnabled(final Level level, final Marker marker, final Object message, final Throwable t) {
return isEnabled(level, marker);
}
@@ -294,7 +362,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Queues for status events.
- *
+ *
* @param <E> Object type to be stored in the queue.
*/
private class BoundedQueue<E> extends ConcurrentLinkedQueue<E> {
[46/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fed34466
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fed34466
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fed34466
Branch: refs/heads/master
Commit: fed344667cce23fe1d8635cf0eee822b2a349d83
Parents: d3b44f4 bd34d17
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 31 00:42:24 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 31 00:42:24 2016 +0900
----------------------------------------------------------------------
.../log4j/message/ParameterFormatter.java | 1 +
.../ReusableParameterizedMessageTest.java | 65 ++++++++++++++++++++
2 files changed, 66 insertions(+)
----------------------------------------------------------------------
[23/50] logging-log4j2 git commit: LOG4J2-1295 GC-free test now
passes in unrolled varargs branch.
Posted by rp...@apache.org.
LOG4J2-1295 GC-free test now passes in unrolled varargs branch.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fbe63f5e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fbe63f5e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fbe63f5e
Branch: refs/heads/master
Commit: fbe63f5e524e9495543775b931f851b2edb71e9c
Parents: a74bb8f
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 07:47:18 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 07:47:18 2016 +0900
----------------------------------------------------------------------
.../test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fbe63f5e/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java
index 2cca348..39a62a1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java
@@ -38,8 +38,6 @@ import static org.junit.Assert.*;
*/
public class GcFreeLoggingTest {
- // ignored: test still fails because of vararg arrays
- @Ignore
@Test
public void testNoAllocationDuringSteadyStateLogging() throws Throwable {
final String javaHome = System.getProperty("java.home");
[30/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d3e3947e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d3e3947e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d3e3947e
Branch: refs/heads/master
Commit: d3e3947e931ce9f516ab99ec8b55de94afb485b0
Parents: c9d274d a0a4e43
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 01:32:35 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 01:32:35 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/RingBufferLogEvent.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[48/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f21bc88b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f21bc88b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f21bc88b
Branch: refs/heads/master
Commit: f21bc88b964348a6c5899c4f0dc7d3999528824c
Parents: fed3446 c78333e
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 31 09:24:13 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 31 09:24:13 2016 +0900
----------------------------------------------------------------------
.../log4j/message/ReusableParameterizedMessage.java | 10 ++++++----
.../logging/log4j/core/layout/CsvParameterLayoutTest.java | 8 ++++----
log4j-core/src/test/resources/gcFreeLogging.xml | 4 +++-
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[49/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/LOG4J2-1278-gc-free-logger' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/LOG4J2-1278-gc-free-logger' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1d18f839
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1d18f839
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1d18f839
Branch: refs/heads/master
Commit: 1d18f839e96b41993ec613db98534a0302003463
Parents: f21bc88 8fa9284
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 31 09:24:53 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 31 09:24:53 2016 +0900
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/50] logging-log4j2 git commit: LOG4J2-1278 added logIfEnabled
methods with unrolled varargs to ExtendedLogger
Posted by rp...@apache.org.
LOG4J2-1278 added logIfEnabled methods with unrolled varargs to ExtendedLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1c6030de
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1c6030de
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1c6030de
Branch: refs/heads/master
Commit: 1c6030de2133974e5e648588563ec0a7ad8e8ea0
Parents: 2dfd2c3
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 00:16:23 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 00:16:23 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/spi/ExtendedLogger.java | 180 ++++++++++++++++++-
1 file changed, 176 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1c6030de/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
index 08b2e7e..fc3a76c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
@@ -304,16 +304,188 @@ public interface ExtendedLogger extends Logger {
void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object... params);
/**
- * Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
- * level is enabled.
+ * Logs a message if the specified level is active.
*
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
* @param marker A Marker or null.
- * @param message The Message.
- * @param t the exception to log, including its stack trace.
+ * @param message The message format.
+ * @param p0 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+ Object p3);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+ Object p3, Object p4);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
*/
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+ Object p3, Object p4, Object p5);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+ Object p3, Object p4, Object p5, Object p6);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+ Object p3, Object p4, Object p5, Object p6, Object p7);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+ Object p3, Object p4, Object p5, Object p6, Object p7, Object p8);
+
+ /**
+ * Logs a message if the specified level is active.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message format.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ */
+ void logIfEnabled(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+ Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9);
+
+ /**
+ * Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
+ * level is enabled.
+ *
+ * @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
+ * method when location information needs to be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The Message.
+ * @param t the exception to log, including its stack trace.
+ */
void logMessage(String fqcn, Level level, Marker marker, Message message, Throwable t);
/**
[14/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to CompositeFilter
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to CompositeFilter
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2dfd2c38
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2dfd2c38
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2dfd2c38
Branch: refs/heads/master
Commit: 2dfd2c38d9bc821c5881b434aa0af5cd8a97eff1
Parents: 65116fe
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:45:03 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:45:03 2016 +1100
----------------------------------------------------------------------
.../log4j/core/filter/CompositeFilter.java | 328 ++++++++++++++++++-
1 file changed, 326 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2dfd2c38/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
index 7a6efbc..9e5754a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
@@ -65,7 +65,7 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
// null does nothing
return this;
}
- // This is not a great implementation but simpler than copying Apache Commons
+ // This is not a great implementation but simpler than copying Apache Commons
// Lang ArrayUtils.removeElement() and associated bits (MutableInt),
// which is OK since removing a filter should not be on the critical path.
final List<Filter> filterList = Arrays.asList(this.filters);
@@ -80,7 +80,7 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
/**
* Gets a new list over the internal filter array.
- *
+ *
* @return a new list over the internal filter array
* @deprecated Use {@link #getFiltersArray()}
*/
@@ -182,6 +182,330 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
* @param marker
* The Marker for the event or null.
* @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
* Any Object.
* @param t
* A Throwable or null.
[33/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fa719343
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fa719343
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fa719343
Branch: refs/heads/master
Commit: fa719343a95f21587944918d382ddd2d0209dcb9
Parents: c6cc1c0 ea43a55
Author: rpopma <rp...@apache.org>
Authored: Sat Mar 26 14:08:40 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Mar 26 14:08:40 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/util/ReflectionUtil.java | 2 +-
.../core/async/AsyncLoggerConfigDisruptor.java | 10 ++--
.../log4j/core/async/AsyncLoggerDisruptor.java | 3 +-
...efaultAsyncLoggerConfigExceptionHandler.java | 54 ++++++++++++++++++++
.../DefaultAsyncLoggerExceptionHandler.java | 52 +++++++++++++++++++
.../logging/log4j/core/async/DisruptorUtil.java | 30 ++++++++---
src/changes/changes.xml | 6 +++
src/site/xdoc/manual/async.xml | 12 ++++-
src/site/xdoc/manual/configuration.xml.vm | 5 +-
9 files changed, 156 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[05/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to log4j-core Logger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to log4j-core Logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ae98c6fe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ae98c6fe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ae98c6fe
Branch: refs/heads/master
Commit: ae98c6fea8b1fdcefcb454785aae99125292b58e
Parents: 48189cc
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:10:16 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:10:16 2016 +1100
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/Logger.java | 223 +++++++++++++++++--
1 file changed, 210 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ae98c6fe/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
index 83996c4..4f0c495 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
@@ -62,7 +62,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* The constructor.
- *
+ *
* @param context The LoggerContext this Logger is associated with.
* @param messageFactory The message factory.
* @param name The name of the Logger.
@@ -99,7 +99,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* Returns the LoggerContext this Logger is associated with.
- *
+ *
* @return the LoggerContext.
*/
public LoggerContext getContext() {
@@ -111,7 +111,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
* <p>
* If the new level is null, this logger inherits the level from its parent.
* </p>
- *
+ *
* @param level The Level to use on this Logger, may be null.
*/
public synchronized void setLevel(final Level level) {
@@ -130,7 +130,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.util.Supplier#get()
*/
@Override
@@ -162,6 +162,74 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
}
@Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return privateConfig.filter(level, marker, message, p0);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return privateConfig.filter(level, marker, message, p0, p1);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ }
+
+ @Override
public boolean isEnabled(final Level level, final Marker marker, final Object message, final Throwable t) {
return privateConfig.filter(level, marker, message, t);
}
@@ -173,7 +241,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @param appender The Appender to add to the Logger.
*/
public void addAppender(final Appender appender) {
@@ -182,7 +250,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @param appender The Appender to remove from the Logger.
*/
public void removeAppender(final Appender appender) {
@@ -191,7 +259,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @return A Map containing the Appender's name as the key and the Appender as the value.
*/
public Map<String, Appender> getAppenders() {
@@ -200,7 +268,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @return An Iterator over all the Filters associated with the Logger.
*/
// FIXME: this really ought to be an Iterable instead of an Iterator
@@ -229,7 +297,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @return The number of Filters associated with the Logger.
*/
public int filterCount() {
@@ -244,7 +312,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @param filter The Filter to add.
*/
public void addFilter(final Filter filter) {
@@ -254,7 +322,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is present only to support the Log4j 1.2 compatibility
* bridge.
- *
+ *
* @return true if the associated LoggerConfig is additive, false otherwise.
*/
public boolean isAdditive() {
@@ -264,7 +332,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is present only to support the Log4j 1.2 compatibility
* bridge.
- *
+ *
* @param additive Boolean value to indicate whether the Logger is additive or not.
*/
public void setAdditive(final boolean additive) {
@@ -367,6 +435,135 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
return level != null && intLevel >= level.intLevel();
}
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8,
+ p9);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
boolean filter(final Level level, final Marker marker, final Object msg, final Throwable t) {
final Filter filter = config.getFilter();
if (filter != null) {
@@ -431,7 +628,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* Returns a String representation of this instance in the form {@code "name:level[ in context_name]"}.
- *
+ *
* @return A String describing this Logger instance.
*/
@Override
[28/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/df1ed3ee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/df1ed3ee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/df1ed3ee
Branch: refs/heads/master
Commit: df1ed3eec60ccc6e98e43440b262f4079eed7482
Parents: 57e8ac9 9ada17c
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 00:36:50 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 00:36:50 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/async/RingBufferLogEvent.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[16/50] logging-log4j2 git commit: LOG4J2-1278 Added convenience
method to LambdaUtil to evaluate lambda Objects (that implement Supplier)
Posted by rp...@apache.org.
LOG4J2-1278 Added convenience method to LambdaUtil to evaluate lambda Objects (that implement Supplier)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e08160eb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e08160eb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e08160eb
Branch: refs/heads/master
Commit: e08160eb23a8e9d8950ebe8feb65f2edd5d0a521
Parents: 1c6030d
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 00:22:35 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 00:22:35 2016 +1100
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/util/LambdaUtil.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e08160eb/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
index 33b0d2a..95dc265 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
@@ -91,4 +91,15 @@ public final class LambdaUtil {
final Object result = supplier.get();
return result instanceof Message ? (Message) result : messageFactory.newMessage(result);
}
+
+ /**
+ * If the specified object is a {@code Supplier} then returns the result of calling its {@link Supplier#get()}
+ * method, otherwise returns the specified object itself.
+ *
+ * @param maybe the object to evaluate if it is a lambda, or return as is if it is not
+ * @return the result of evaluating the specified lambda, or the specified object itself it not a lambda
+ */
+ public static Object maybeLambda(final Object maybe) {
+ return maybe instanceof Supplier<?> ? ((Supplier<?>) maybe).get() : maybe;
+ }
}
[20/50] logging-log4j2 git commit: Allow SslConfigurationTest to pass
when offline and DNS host name lookup fails.
Posted by rp...@apache.org.
Allow SslConfigurationTest to pass when offline and DNS host name lookup fails.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a76c056b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a76c056b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a76c056b
Branch: refs/heads/master
Commit: a76c056be651e5f0ba1e5e072dd1d24a134d5818
Parents: 7a5f0e6
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 18 00:31:38 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 18 00:31:38 2016 +1100
----------------------------------------------------------------------
.../core/net/ssl/SslConfigurationTest.java | 27 +++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a76c056b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
index 6e5773c..e830604 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.net.ssl;
import java.io.IOException;
import java.io.OutputStream;
+import java.net.UnknownHostException;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
@@ -40,9 +41,13 @@ public class SslConfigurationTest {
public void emptyConfigurationHasDefaultTrustStore() throws IOException {
final SslConfiguration sc = SslConfiguration.createSSLConfiguration(null, null, null);
final SSLSocketFactory factory = sc.getSslSocketFactory();
- try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
- Assert.assertNotNull(clientSocket);
- clientSocket.close();
+ try {
+ try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
+ Assert.assertNotNull(clientSocket);
+ clientSocket.close();
+ }
+ } catch (UnknownHostException offline) {
+ // this exception is thrown on Windows when offline
}
}
@@ -51,13 +56,17 @@ public class SslConfigurationTest {
final TrustStoreConfiguration tsc = new TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE, null, null, null);
final SslConfiguration sc = SslConfiguration.createSSLConfiguration(null, null, tsc);
final SSLSocketFactory factory = sc.getSslSocketFactory();
- try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
- try (final OutputStream os = clientSocket.getOutputStream()) {
- os.write("GET config/login_verify2?".getBytes());
- Assert.fail("Expected IOException");
- } catch (final IOException e) {
- // Expected, do nothing.
+ try {
+ try (final SSLSocket clientSocket = (SSLSocket) factory.createSocket(TLS_TEST_HOST, TLS_TEST_PORT)) {
+ try (final OutputStream os = clientSocket.getOutputStream()) {
+ os.write("GET config/login_verify2?".getBytes());
+ Assert.fail("Expected IOException");
+ } catch (final IOException e) {
+ // Expected, do nothing.
+ }
}
+ } catch (UnknownHostException offline) {
+ // this exception is thrown on Windows when offline
}
}
[36/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/febd70e9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/febd70e9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/febd70e9
Branch: refs/heads/master
Commit: febd70e936bb545ad12bb76c980f708da28880ed
Parents: db1cb29 a218285
Author: rpopma <rp...@apache.org>
Authored: Mon Mar 28 17:22:23 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Mar 28 17:22:23 2016 +0900
----------------------------------------------------------------------
.../log4j/message/ParameterFormatter.java | 103 ++++++++++
.../log4j/message/ParameterizedMessage.java | 13 +-
.../message/ReusableParameterizedMessage.java | 20 +-
.../log4j/message/ParameterizedMessageTest.java | 8 +
.../message/ParameterFormatterBenchmark.java | 188 +++++++++++++++++++
5 files changed, 326 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/febd70e9/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
----------------------------------------------------------------------
[31/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5a873ddf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5a873ddf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5a873ddf
Branch: refs/heads/master
Commit: 5a873ddf0898efdf637b9abcea2facd2aa126ad2
Parents: d3e3947 29a4e87
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 25 01:16:05 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 25 01:16:05 2016 +0900
----------------------------------------------------------------------
.../core/appender/DefaultErrorHandler.java | 4 +
.../core/appender/rolling/PatternProcessor.java | 581 ++++++++++---------
.../log4j/core/async/RingBufferLogEvent.java | 99 ++--
.../logging/log4j/core/layout/GelfLayout.java | 45 +-
.../pattern/ThreadNamePatternConverter.java | 2 +-
.../logging/log4j/core/GcFreeLoggingTest.java | 6 +-
.../log4j/core/layout/GelfLayoutTest.java | 12 +
log4j-core/src/test/resources/gcFreeLogging.xml | 19 +
src/site/xdoc/manual/layouts.xml.vm | 1 +
9 files changed, 414 insertions(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5a873ddf/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTest.java
----------------------------------------------------------------------
[50/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/LOG4J2-1278-gc-free-logger'
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/LOG4J2-1278-gc-free-logger'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/78681540
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/78681540
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/78681540
Branch: refs/heads/master
Commit: 78681540d93efed492ecee5ba3af6b3e49309ac8
Parents: aa3a966 1d18f83
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 31 16:57:17 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 31 16:57:17 2016 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Logger.java | 1957 +++++++++++++++++-
.../logging/log4j/message/MessageFactory2.java | 172 ++
.../log4j/message/ParameterizedMessage.java | 2 +-
.../log4j/message/ReusableMessageFactory.java | 59 +-
.../logging/log4j/simple/SimpleLogger.java | 68 +
.../logging/log4j/spi/AbstractLogger.java | 1009 ++++++++-
.../logging/log4j/spi/ExtendedLogger.java | 369 +++-
.../log4j/spi/ExtendedLoggerWrapper.java | 82 +-
.../log4j/spi/MessageFactory2Adapter.java | 112 +
.../logging/log4j/status/StatusLogger.java | 82 +-
.../logging/log4j/AbstractLoggerTest.java | 216 +-
.../apache/logging/log4j/LambdaLoggerTest.java | 144 +-
.../org/apache/logging/log4j/LoggerTest.java | 49 +-
.../org/apache/logging/log4j/TestLogger.java | 68 +
.../org/apache/logging/log4j/core/Filter.java | 171 ++
.../org/apache/logging/log4j/core/Logger.java | 225 +-
.../log4j/core/filter/AbstractFilter.java | 204 ++
.../log4j/core/filter/CompositeFilter.java | 328 ++-
.../logging/log4j/core/GcFreeLoggingTest.java | 2 -
.../apache/logging/log4j/core/LoggerTest.java | 7 +-
.../core/filter/DynamicThresholdFilterTest.java | 4 +-
.../log4j/core/filter/LevelRangeFilterTest.java | 4 +-
.../log4j/core/filter/MarkerFilterTest.java | 6 +-
.../log4j/core/filter/RegexFilterTest.java | 11 +-
.../core/filter/ThreadContextMapFilterTest.java | 16 +-
.../log4j/core/filter/ThresholdFilterTest.java | 4 +-
.../log4j/core/filter/TimeFilterTest.java | 2 +-
.../core/net/ssl/SslConfigurationTest.java | 27 +-
.../log4j/perf/jmh/VarargsBenchmark.java | 17 +-
.../org/apache/logging/slf4j/SLF4JLogger.java | 72 +-
30 files changed, 5214 insertions(+), 275 deletions(-)
----------------------------------------------------------------------
[08/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to ExtendedLoggerWrapper
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to ExtendedLoggerWrapper
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/24551fbe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/24551fbe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/24551fbe
Branch: refs/heads/master
Commit: 24551fbe756df6f8fd115d15f21ddb95bd32add7
Parents: 5d1c542
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:23:24 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:23:24 2016 +1100
----------------------------------------------------------------------
.../log4j/spi/ExtendedLoggerWrapper.java | 82 ++++++++++++++++++--
1 file changed, 75 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24551fbe/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
index b5ef667..6c00755 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
@@ -35,7 +35,7 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
/**
* Constructor that wraps and existing Logger.
- *
+ *
* @param logger The Logger to wrap.
* @param name The name of the Logger.
* @param messageFactory TODO
@@ -52,7 +52,7 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
/**
* Detect if the event would be logged.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The Message.
@@ -66,7 +66,7 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
/**
* Detect if the event would be logged.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -80,7 +80,7 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
/**
* Detect if the event would be logged.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -93,7 +93,7 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
/**
* Detect if the event would be logged.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -105,9 +105,77 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
return logger.isEnabled(level, marker, message, params);
}
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return logger.isEnabled(level, marker, message, p0);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return logger.isEnabled(level, marker, message, p0, p1);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2, p3);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ }
+
/**
* Detect if the event would be logged.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -122,7 +190,7 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
/**
* Always log an event. This tends to be already guarded by an enabled check, so this method should not check for
* the logger level again
- *
+ *
* @param fqcn The fully qualified class name of the <b>caller</b>
* @param level The logging level
* @param marker The Marker
[06/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to Filter and AbstractFilter
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to Filter and AbstractFilter
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7db64d5d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7db64d5d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7db64d5d
Branch: refs/heads/master
Commit: 7db64d5dfa60bb473889a445f6b7290993cac9ba
Parents: ae98c6f
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:10:45 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:10:45 2016 +1100
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/Filter.java | 171 ++++++++++++++++
.../log4j/core/filter/AbstractFilter.java | 204 +++++++++++++++++++
2 files changed, 375 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7db64d5d/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
index af1dd68..0286498 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
@@ -103,6 +103,177 @@ public interface Filter extends LifeCycle {
/**
* Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8, Object p9);
+
+ /**
+ * Filter an event.
* @param logger The Logger.
* @param level The event logging Level.
* @param marker The Marker for the event or null.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7db64d5d/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
index 52ee030..9473d70 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
@@ -136,6 +136,210 @@ public abstract class AbstractFilter extends AbstractLifeCycle implements Filter
}
/**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return Result.NEUTRAL;
+ }
+
+ /**
* Returns the Result to be returned when a match occurs.
* @return the onMatch Result.
*/