You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/03/16 01:21:21 UTC
[37/38] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1116
Merge branch 'master' into LOG4J2-1116
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/78b5295c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/78b5295c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/78b5295c
Branch: refs/heads/LOG4J2-1116
Commit: 78b5295c830984e5deac8ef3715bf34ac42f36dd
Parents: 53a4b15 6ba91a3
Author: Ralph Goers <rg...@nextiva.com>
Authored: Tue Mar 15 16:11:31 2016 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Tue Mar 15 16:11:31 2016 -0700
----------------------------------------------------------------------
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/spi/AbstractLogger.java | 11 +-
log4j-core/pom.xml | 6 +
.../log4j/core/appender/AsyncAppender.java | 5 +-
.../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 | 10 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 8 +-
.../core/async/DefaultAsyncEventRouter.java | 5 +-
.../core/async/DiscardingAsyncEventRouter.java | 35 +--
.../logging/log4j/core/async/EventRoute.java | 4 +-
.../log4j/core/async/RingBufferLogEvent.java | 21 +-
.../async/RingBufferLogEventTranslator.java | 53 +---
.../log4j/core/filter/CompositeFilter.java | 76 +++--
.../logging/log4j/core/lookup/JndiLookup.java | 5 +-
.../pattern/EqualsReplacementConverter.java | 48 ++-
.../log4j/core/util/ObjectArrayIterator.java | 179 +++++++++++
.../log4j/core/CustomLevelsWithFiltersTest.java | 8 +-
.../logging/log4j/core/GcFreeLoggingTest.java | 131 ++++++++
.../core/async/AsyncEventRouterFactoryTest.java | 57 +---
.../core/async/DefaultAsyncEventRouterTest.java | 25 +-
.../async/DiscardingAsyncEventRouterTest.java | 79 ++---
.../log4j/core/layout/PatternLayoutTest.java | 22 ++
.../pattern/EqualsReplacementConverterTest.java | 63 +++-
.../apache/logging/log4j/core/util/Compare.java | 134 --------
.../appender/FlumeEmbeddedAppenderTest.java | 10 +-
log4j-jmx-gui/pom.xml | 4 +-
.../log4j/web/appender/ServletAppender.java | 4 +-
pom.xml | 8 +-
src/changes/changes.xml | 5 +-
src/site/xdoc/manual/async.xml | 8 +-
src/site/xdoc/manual/configuration.xml.vm | 28 +-
43 files changed, 1223 insertions(+), 570 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/78b5295c/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 ae71065,244b8e7..005d54f
--- 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
@@@ -96,10 -91,9 +96,10 @@@ public abstract class AbstractLogger im
private static final String THROWING = "Throwing";
private static final String CATCHING = "Catching";
- private final String name;
+ protected final String name;
private final MessageFactory messageFactory;
private final FlowMessageFactory flowMessageFactory;
+ private final transient ThreadLocalRegistry registry;
/**
* Creates a new logger named after this class (or subclass).