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/14 10:37:43 UTC

[6/6] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1365

Merge branch 'master' into LOG4J2-1365


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b59f231
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b59f231
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b59f231

Branch: refs/heads/LOG4J2-1365
Commit: 8b59f231fc741e69578c4c6e63ac63a8eb06cf62
Parents: 07723d5 c3463a8
Author: Mikael Ståldal <mi...@magine.com>
Authored: Thu Apr 14 10:32:55 2016 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Thu Apr 14 10:32:55 2016 +0200

----------------------------------------------------------------------
 .../logging/log4j/core/impl/Log4jLogEvent.java  |  28 +-
 .../log4j/core/impl/MutableLogEvent.java        | 199 +++++++++++++
 .../core/impl/ReusableLogEventFactory.java      |  80 ++++++
 .../log4j/core/layout/AbstractStringLayout.java |  21 +-
 .../logging/log4j/core/layout/GelfLayout.java   |  10 +-
 .../layout/LockingStringBuilderEncoder.java     |  52 ++++
 .../log4j/core/layout/PatternLayout.java        |   5 +-
 .../log4j/core/layout/StringBuilderEncoder.java | 111 ++++++++
 .../log4j/core/layout/TextEncoderHelper.java    | 153 +++++-----
 .../core/layout/StringBuilderEncoderTest.java   | 277 +++++++++++++++++++
 .../core/layout/TextEncoderHelperTest.java      | 263 ------------------
 .../perf/jmh/TextEncoderHelperBenchmark.java    |  97 ++++---
 .../logging/log4j/perf/nogc/NoGcLayout.java     |  11 +-
 src/site/xdoc/manual/garbagefree.xml            |   6 +-
 14 files changed, 901 insertions(+), 412 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b59f231/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
----------------------------------------------------------------------