You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/04/18 13:38:35 UTC
[49/50] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1365
Merge branch 'master' into LOG4J2-1365
Conflicts:
log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/86f30cfc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/86f30cfc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/86f30cfc
Branch: refs/heads/LOG4J2-1365
Commit: 86f30cfcf1f816f2b491cfab74959049363c7a48
Parents: dae9d79 d3e571f
Author: Mikael Ståldal <mi...@magine.com>
Authored: Mon Apr 18 13:27:17 2016 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Mon Apr 18 13:27:17 2016 +0200
----------------------------------------------------------------------
.../ParameterizedNoReferenceMessageFactory.java | 39 +-
.../message/ReusableParameterizedMessage.java | 2 +-
.../logging/log4j/message/SimpleMessage.java | 3 +-
.../org/apache/logging/log4j/util/Strings.java | 12 +
.../org/apache/logging/log4j/util/Unbox.java | 2 -
.../log4j/message/ParameterFormatterTest.java | 2 -
.../apache/logging/log4j/util/UnboxTest.java | 2 +
log4j-core/pom.xml | 5 +
.../log4j/core/appender/AsyncAppender.java | 28 +-
.../log4j/core/appender/FileManager.java | 3 +-
.../core/appender/MemoryMappedFileManager.java | 3 +-
.../core/appender/OutputStreamManager.java | 7 +-
.../core/appender/RandomAccessFileManager.java | 3 +-
.../RollingRandomAccessFileAppender.java | 2 +-
.../core/appender/rolling/PatternProcessor.java | 1 +
.../appender/rolling/RollingFileManager.java | 4 +-
.../rolling/RollingRandomAccessFileManager.java | 3 +-
.../appender/rolling/action/DeleteAction.java | 432 +++++-----
.../core/async/AsyncEventRouterFactory.java | 2 -
.../log4j/core/async/AsyncLoggerConfig.java | 1 +
.../core/async/AsyncLoggerConfigDelegate.java | 10 +
.../core/async/AsyncLoggerConfigDisruptor.java | 66 +-
.../logging/log4j/core/async/EventRoute.java | 9 +-
.../log4j/core/async/RingBufferLogEvent.java | 15 +-
.../core/async/ThreadNameCachingStrategy.java | 4 +-
.../logging/log4j/core/config/LoggerConfig.java | 5 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 3 +-
.../log4j/core/impl/MutableLogEvent.java | 46 +-
.../core/impl/ReusableLogEventFactory.java | 34 +-
.../log4j/core/jackson/Initializers.java | 2 +-
.../log4j/core/jackson/Log4jYamlModule.java | 48 ++
.../core/jackson/Log4jYamlObjectMapper.java | 41 +
.../core/layout/AbstractJacksonLayout.java | 17 +-
.../core/layout/ByteBufferDestination.java | 8 +-
.../log4j/core/layout/CsvLogEventLayout.java | 213 +++--
.../log4j/core/layout/CsvParameterLayout.java | 207 +++--
.../logging/log4j/core/layout/GelfLayout.java | 9 +-
.../log4j/core/layout/JacksonFactory.java | 36 +-
.../layout/LockingStringBuilderEncoder.java | 3 +-
.../log4j/core/layout/StringBuilderEncoder.java | 3 +-
.../log4j/core/layout/TextEncoderHelper.java | 1 -
.../logging/log4j/core/layout/YamlLayout.java | 824 +++++++++++++++++++
.../logging/log4j/core/net/SmtpManager.java | 5 +-
.../log4j/core/net/server/TcpSocketServer.java | 19 +-
.../core/pattern/DatePatternConverter.java | 3 +-
.../ExtendedThrowablePatternConverter.java | 6 +-
.../pattern/RootThrowablePatternConverter.java | 6 +-
.../logging/log4j/core/util/Constants.java | 45 +-
.../logging/log4j/MarkerMixInYamlTest.java | 31 +
.../log4j/core/AppenderRefLevelJsonTest.java | 12 +-
.../log4j/core/AppenderRefLevelTest.java | 12 +-
.../core/GcFreeAsynchronousLoggingTest.java | 41 +
.../logging/log4j/core/GcFreeLoggingTest.java | 167 ----
.../log4j/core/GcFreeLoggingTestUtil.java | 170 ++++
.../core/GcFreeMixedSyncAyncLoggingTest.java | 43 +
.../core/GcFreeSynchronousLoggingTest.java | 42 +
.../apache/logging/log4j/core/LoggerTest.java | 12 +-
.../logging/log4j/core/LoggerUpdateTest.java | 4 +-
.../logging/log4j/core/PatternSelectorTest.java | 12 +-
.../logging/log4j/core/StrictXmlConfigTest.java | 13 +-
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../log4j/core/appender/SocketAppenderTest.java | 2 +-
.../log4j/core/async/perftest/IdleStrategy.java | 43 +
.../core/async/perftest/NoOpIdleStrategy.java | 34 +
.../core/async/perftest/SimpleLatencyTest.java | 119 ++-
.../core/filter/AbstractScriptFilterTest.java | 4 +-
.../log4j/core/impl/MutableLogEventTest.java | 84 ++
.../log4j/core/jackson/LevelMixInJsonTest.java | 1 +
.../log4j/core/jackson/LevelMixInYamlTest.java | 29 +
.../jackson/StackTraceElementMixInTest.java | 5 +
.../log4j/core/layout/YamlLayoutTest.java | 287 +++++++
.../log4j/test/appender/ListAppender.java | 9 +-
.../resources/JsonCompleteFileAppenderTest.xml | 4 +-
.../resources/gcFreeMixedSyncAsyncLogging.xml | 71 ++
.../appender/NoSqlDatabaseManagerTest.java | 26 +-
.../message/ParameterFormatterBenchmark.java | 2 -
.../log4j/perf/jmh/CollectionsBenchmark.java | 12 +-
.../log4j/perf/jmh/LoggerConfigBenchmark.java | 2 +-
.../perf/jmh/TextEncoderHelperBenchmark.java | 2 +-
...ThreadLocalVsConcurrentHashMapBenchmark.java | 186 ++---
.../logging/log4j/perf/nogc/NoGcLayout.java | 1 -
.../logging/log4j/lookup/CustomLookup.java | 3 +-
.../logging/log4j/lookup/MapMessageLookup.java | 6 +-
.../org/apache/logging/slf4j/LoggerTest.java | 360 ++++----
.../log4j/web/ServletRequestThreadContext.java | 29 +
pom.xml | 5 +
src/changes/changes.xml | 3 +
src/site/site.xml | 1 +
src/site/xdoc/manual/layouts.xml.vm | 151 ++++
89 files changed, 3193 insertions(+), 1093 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/86f30cfc/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/86f30cfc/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------
diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
index 9504e8a,6929596..e1e6ab0
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
@@@ -30,12 -33,9 +30,11 @@@ import org.apache.logging.log4j.message
import org.apache.logging.log4j.message.ReusableMessage;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.message.TimestampMessage;
- import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
-import com.lmax.disruptor.EventFactory;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
/**
* When the Disruptor is started, the RingBuffer is populated with event objects. These objects are then re-used during
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/86f30cfc/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
----------------------------------------------------------------------