Merge remote-tracking branch 'origin/master'
Conflicts:
src/site/xdoc/manual/layouts.xml.vm
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6ad2d292
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6ad2d292
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6ad2d292
Branch: refs/heads/master
Commit: 6ad2d292b89ba6ef4b85544ac8edcff1a2d221bc
Parents: c972341 dff54a8
Author: Mikael Ståldal <[email protected]>
Authored: Mon Sep 28 18:13:46 2015 +0200
Committer: Mikael Ståldal <[email protected]>
Committed: Mon Sep 28 18:13:46 2015 +0200
----------------------------------------------------------------------
checkstyle.xml | 7 +
.../org/apache/logging/log4j/EventLogger.java | 4 +-
.../java/org/apache/logging/log4j/Level.java | 82 +--
.../org/apache/logging/log4j/LogManager.java | 205 +++---
.../java/org/apache/logging/log4j/Logger.java | 227 ++++---
.../java/org/apache/logging/log4j/Marker.java | 40 +-
.../org/apache/logging/log4j/MarkerManager.java | 37 +-
.../org/apache/logging/log4j/ThreadContext.java | 143 ++--
.../logging/log4j/message/FormattedMessage.java | 4 +-
.../logging/log4j/message/LocalizedMessage.java | 21 +-
.../logging/log4j/message/ObjectMessage.java | 8 +-
.../message/ParameterizedMessageFactory.java | 5 +-
.../message/StringFormatterMessageFactory.java | 4 +-
.../logging/log4j/message/StructuredDataId.java | 39 +-
.../logging/log4j/simple/SimpleLogger.java | 20 +-
.../log4j/simple/SimpleLoggerContext.java | 2 +-
.../simple/SimpleLoggerContextFactory.java | 6 +-
.../logging/log4j/spi/AbstractLogger.java | 75 +--
.../log4j/spi/AbstractLoggerAdapter.java | 14 +-
.../log4j/spi/DefaultThreadContextMap.java | 22 +-
.../log4j/spi/DefaultThreadContextStack.java | 70 +-
.../log4j/spi/ExtendedLoggerWrapper.java | 26 +-
.../org/apache/logging/log4j/spi/Provider.java | 5 +-
.../apache/logging/log4j/spi/StandardLevel.java | 10 +-
.../apache/logging/log4j/status/StatusData.java | 14 +-
.../logging/log4j/status/StatusLogger.java | 41 +-
.../org/apache/logging/log4j/util/Chars.java | 17 +-
.../apache/logging/log4j/util/EnglishEnums.java | 6 +-
.../apache/logging/log4j/util/LambdaUtil.java | 2 +-
.../apache/logging/log4j/util/LoaderUtil.java | 53 +-
.../logging/log4j/util/PropertiesUtil.java | 80 ++-
.../apache/logging/log4j/util/ProviderUtil.java | 36 +-
.../logging/log4j/util/ReflectionUtil.java | 58 +-
.../logging/log4j/util/StringBuilders.java | 25 +-
.../org/apache/logging/log4j/util/Strings.java | 29 +-
.../org/apache/logging/log4j/core/Logger.java | 96 +--
.../logging/log4j/core/LoggerContext.java | 254 +++----
.../log4j/core/appender/AbstractAppender.java | 47 +-
.../appender/AbstractOutputStreamAppender.java | 27 +-
.../log4j/core/appender/AsyncAppender.java | 65 +-
.../log4j/core/appender/ConsoleAppender.java | 68 +-
.../core/appender/MemoryMappedFileManager.java | 17 +-
.../core/appender/RandomAccessFileManager.java | 4 +-
.../core/appender/RollingFileAppender.java | 3 +-
.../appender/mom/jeromq/JeroMqAppender.java | 154 ++---
.../core/appender/mom/jeromq/package-info.java | 23 +
.../core/appender/mom/kafka/package-info.java | 23 +
.../rolling/RollingRandomAccessFileManager.java | 33 +-
.../rolling/SizeBasedTriggeringPolicy.java | 6 +-
.../rolling/TimeBasedTriggeringPolicy.java | 10 +-
.../rolling/action/CommonsCompressAction.java | 14 +-
.../rolling/action/ZipCompressAction.java | 21 +-
.../logging/log4j/core/async/AsyncLogger.java | 137 ++--
.../log4j/core/async/AsyncLoggerConfig.java | 5 +-
.../core/async/AsyncLoggerConfigHelper.java | 117 ++--
.../log4j/core/async/DaemonThreadFactory.java | 6 +-
.../log4j/core/async/RingBufferLogEvent.java | 10 +-
.../core/config/AbstractConfiguration.java | 205 +++---
.../log4j/core/config/AppenderControl.java | 16 +-
.../AwaitCompletionReliabilityStrategy.java | 35 +-
...AwaitUnconditionallyReliabilityStrategy.java | 10 +-
.../log4j/core/config/DefaultAdvertiser.java | 2 +-
.../config/DefaultConfigurationMonitor.java | 8 +-
.../core/config/DefaultReliabilityStrategy.java | 8 +-
.../core/config/LockingReliabilityStrategy.java | 35 +-
.../logging/log4j/core/config/LoggerConfig.java | 8 +-
.../log4j/core/config/NullConfiguration.java | 5 +-
.../log4j/core/config/ReliabilityStrategy.java | 17 +-
.../core/config/ReliabilityStrategyFactory.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 3 +-
.../core/config/json/JsonConfiguration.java | 5 +-
.../plugins/processor/PluginProcessor.java | 35 +-
.../config/plugins/processor/package-info.java | 2 +-
.../core/config/plugins/util/PluginBuilder.java | 1 -
.../core/config/plugins/util/ResolverUtil.java | 6 +-
.../core/config/plugins/util/package-info.java | 2 +-
.../validators/RequiredValidator.java | 4 +-
.../plugins/visitors/AbstractPluginVisitor.java | 39 +-
.../plugins/visitors/PluginNodeVisitor.java | 2 +-
.../config/plugins/visitors/package-info.java | 2 +-
.../PropertiesConfigurationFactory.java | 35 +-
.../log4j/core/config/xml/XmlConfiguration.java | 181 ++---
.../logging/log4j/core/impl/Log4jLogEvent.java | 5 +-
.../log4j/core/layout/AbstractStringLayout.java | 16 +
.../log4j/core/layout/CsvLogEventLayout.java | 7 +-
.../log4j/core/layout/CsvParameterLayout.java | 4 +-
.../logging/log4j/core/layout/GelfLayout.java | 4 +-
.../logging/log4j/core/layout/HtmlLayout.java | 9 +-
.../core/layout/MarkerPatternSelector.java | 125 ++++
.../log4j/core/layout/PatternLayout.java | 112 +++-
.../logging/log4j/core/layout/PatternMatch.java | 154 +++++
.../log4j/core/layout/PatternSelector.java | 30 +
.../log4j/core/layout/Rfc5424Layout.java | 4 +-
.../logging/log4j/core/layout/SyslogLayout.java | 4 +-
.../logging/log4j/core/layout/XmlLayout.java | 3 +
.../log4j/core/lookup/AbstractLookup.java | 2 +-
.../log4j/core/lookup/MainMapLookup.java | 22 +-
.../logging/log4j/core/lookup/MapLookup.java | 44 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 99 ++-
.../logging/log4j/core/util/FileUtils.java | 17 +-
.../logging/log4j/core/util/Integers.java | 24 +-
.../logging/log4j/core/util/JndiCloser.java | 5 +-
.../logging/log4j/core/util/KeyValuePair.java | 8 +-
.../apache/logging/log4j/core/util/Loader.java | 6 +-
.../log4j/core/util/NanoClockFactory.java | 8 +-
.../logging/log4j/core/util/NetUtils.java | 10 +-
.../log4j/core/util/NullOutputStream.java | 2 +-
.../logging/log4j/core/util/Patterns.java | 5 +-
.../logging/log4j/core/util/ReflectionUtil.java | 2 +
.../logging/log4j/core/util/SetUtils.java | 9 +-
.../logging/log4j/core/util/Throwables.java | 36 +-
.../logging/log4j/core/util/UuidUtil.java | 23 +-
.../log4j/core/util/datetime/DateParser.java | 34 +-
.../log4j/core/util/datetime/DatePrinter.java | 2 +-
.../core/util/datetime/FastDateFormat.java | 471 +++++++------
.../core/util/datetime/FastDateParser.java | 488 +++++++-------
.../core/util/datetime/FastDatePrinter.java | 346 ++++++----
.../core/util/datetime/FixedDateFormat.java | 35 +-
.../log4j/core/util/datetime/FormatCache.java | 163 ++---
.../log4j/core/util/datetime/package-info.java | 20 +
log4j-core/src/site/xdoc/index.xml | 14 +-
.../logging/log4j/core/PatternSelectorTest.java | 55 ++
.../core/appender/ConsoleAppenderTest.java | 2 +-
.../log4j/core/layout/PatternLayoutTest.java | 40 +-
.../logging/log4j/core/util/ThrowablesTest.java | 19 +
.../test/resources/log4j-patternSelector.xml | 33 +
.../nosql/appender/AbstractNoSqlConnection.java | 48 ++
.../appender/couchdb/CouchDbConnection.java | 145 ++--
.../appender/mongodb/MongoDbConnection.java | 216 +++---
.../nosql/appender/mongodb/MongoDbProvider.java | 85 +--
.../log4j/nosql/appender/MongoDbAuthTest.java | 37 ++
.../src/test/resources/log4j2-mongodb-auth.xml | 30 +
.../log4j/perf/jmh/PatternLayoutBenchmark.java | 16 +-
.../jmh/PatternLayoutComparisonBenchmark.java | 2 +-
.../logging/slf4j/CallerInformationTest.java | 130 ++--
.../logging/slf4j/InitialLoggerContext.java | 71 --
.../apache/logging/slf4j/LoggerContextRule.java | 72 ++
.../org/apache/logging/slf4j/LoggerTest.java | 318 ++++-----
pom.xml | 2 +-
src/changes/changes.xml | 22 +-
src/site/custom/project-info-report.properties | 666 +++++++++----------
src/site/pdf.xml | 114 ++--
src/site/site.xml | 8 +-
src/site/xdoc/articles.xml | 16 +
src/site/xdoc/changelog.xml | 87 ++-
src/site/xdoc/faq.xml | 474 +++++++------
src/site/xdoc/manual/appenders.xml | 36 +-
src/site/xdoc/manual/customconfig.xml | 24 +-
src/site/xdoc/manual/layouts.xml.vm | 150 +++--
src/site/xdoc/manual/plugins.xml | 456 ++++++-------
150 files changed, 5041 insertions(+), 3950 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6ad2d292/src/site/xdoc/manual/layouts.xml.vm
----------------------------------------------------------------------
diff --cc src/site/xdoc/manual/layouts.xml.vm
index add4d8f,e0389a0..15bfcb8
--- a/src/site/xdoc/manual/layouts.xml.vm
+++ b/src/site/xdoc/manual/layouts.xml.vm
@@@ -172,6 -176,78 +176,77 @@@ logger.debug("one={}, two={}, three={}"
0,1441617184044,DEBUG,main,"one=1, two=2,
three=3",org.apache.logging.log4j.spi.AbstractLogger,,,,org.apache.logging.log4j.core.layout.CsvLogEventLayoutTest.testLayout(CsvLogEventLayoutTest.java:98),{},[]
</pre>
</subsection>
+ <a name="GELFLayout"/>
+ <subsection name="GELF Layout">
+ <!-- From Javadoc of
org.apache.logging.log4j.core.layout.GELFLayout -->
+ <p>
+ Lays out events in the Graylog Extended Log Format (GELF) 1.1.
+ </p>
+ <p>
+ This layout compresses JSON to GZIP or ZLIB (the
<code>compressionType</code>) if log event data is larger than 1024 bytes
+ (the <code>compressionThreshold</code>). This layout does not
implement chunking.
+ </p>
+ <p>
+ Configure as follows to send to a Graylog2 server:
+ </p>
+ <pre class="prettyprint linenums">[
+ <Appenders>
+ <Socket name="Graylog" protocol="udp" host="graylog.domain.com"
port="12201">
+ <GelfLayout host="someserver" compressionType="GZIP"
compressionThreshold="1024">
+ <KeyValuePair key="additionalField1" value="additional value
1"/>
+ <KeyValuePair key="additionalField2" value="additional value
2"/>
+ </GelfLayout>
+ </Socket>
+ </Appenders>
+ ]
+ </pre>
+ <p>
+ See also:
+ </p>
+ <ul>
- <li>The <a href="http://graylog2.org/gelf";>GELF home
page</a></li>
- <li>The <a
href="http://graylog2.org/resources/gelf/specification";>GELF
specification</a></li>
++ <li>The <a href="https://www.graylog.org/resources/gelf/";>GELF
specification</a></li>
+ </ul>
+ </subsection>
+ <a name="HTMLLayout"/>
+ <subsection name="HTMLLayout">
+ <p>The HTMLLayout generates an HTML page and adds each LogEvent to
a row in a table.
+ </p>
+ <table>
+ <tr>
+ <th>Parameter Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>charset</td>
+ <td>String</td>
+ <td>The character set to use when converting the HTML String to
a byte array. The value must be
+ a valid ${Charset}. If not specified, this layout uses
UTF-8.</td>
+ </tr>
+ <tr>
+ <td>contentType</td>
+ <td>String</td>
+ <td>The value to assign to the Content-Type header. The default
is "text/html".</td>
+ </tr>
+ <tr>
+ <td>locationInfo</td>
+ <td>boolean</td>
+ <td>
+ <a name="HtmlLocationInfo" />
+ <p>If true, the filename and line number will be included in
the HTML output. The default value is
+ false.</p>
+ <p>Generating <a href="#LocationInformation">location
information</a>
+ is an expensive operation and may impact performance. Use
with caution.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>String</td>
+ <td>A String that will appear as the HTML title.</td>
+ </tr>
+ <caption align="top">HTML Layout Parameters</caption>
+ </table>
+ </subsection>
<a name="JSONLayout"/>
<subsection name="JSONLayout">
<!-- From Javadoc of
org.apache.logging.log4j.core.layout.JSONLayout -->
