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 2015/07/12 16:11:39 UTC
[1/3] logging-log4j2 git commit: documented logic for special case
Repository: logging-log4j2
Updated Branches:
refs/heads/master 5a4c751c5 -> a2fd2ef8a
documented logic for special case
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c67ccb0e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c67ccb0e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c67ccb0e
Branch: refs/heads/master
Commit: c67ccb0e5c647a542ea78eb84dc3a82eff3c7528
Parents: 483d2ca
Author: rpopma <rp...@apache.org>
Authored: Sun Jul 12 11:43:01 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Jul 12 11:43:01 2015 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/AsyncLoggerConfigHelper.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c67ccb0e/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
index 03e9393..c4fe1d2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
@@ -331,6 +331,12 @@ class AsyncLoggerConfigHelper {
try {
LogEvent logEvent = event;
if (event instanceof RingBufferLogEvent) {
+ // Deal with special case where both types of Async Loggers are used together:
+ // RingBufferLogEvents are created by the all-loggers-async type, but
+ // this event is also consumed by the some-loggers-async type (this class).
+ // The original event will be re-used and modified in an application thread later,
+ // so take a snapshot of it, which can be safely processed in the
+ // some-loggers-async background thread.
logEvent = ((RingBufferLogEvent) event).createMemento();
}
logEvent.getMessage().getFormattedMessage(); // LOG4J2-763: ask message to freeze parameters
[3/3] logging-log4j2 git commit: improve error reporting: print the
full offending pattern if it cannot be parsed
Posted by rp...@apache.org.
improve error reporting: print the full offending pattern if it cannot
be parsed
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a2fd2ef8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a2fd2ef8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a2fd2ef8
Branch: refs/heads/master
Commit: a2fd2ef8aaf0d43a82c9b8237c231a1237c2026d
Parents: c785f89
Author: rpopma <rp...@apache.org>
Authored: Sun Jul 12 23:11:54 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Jul 12 23:11:54 2015 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/layout/PatternLayout.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a2fd2ef8/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index f5496ef..d09382e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -126,7 +126,12 @@ public final class PatternLayout extends AbstractStringLayout {
this.alwaysWriteExceptions = alwaysWriteExceptions;
this.noConsoleNoAnsi = noConsoleNoAnsi;
final PatternParser parser = createPatternParser(config);
- this.formatters = parser.parse(pattern == null ? DEFAULT_CONVERSION_PATTERN : pattern, this.alwaysWriteExceptions, this.noConsoleNoAnsi);
+ try {
+ this.formatters = parser.parse(pattern == null ? DEFAULT_CONVERSION_PATTERN : pattern,
+ this.alwaysWriteExceptions, this.noConsoleNoAnsi);
+ } catch (RuntimeException ex) {
+ throw new IllegalArgumentException("Cannot parse pattern '" + pattern + "'", ex);
+ }
}
private static byte[] toBytes(final String str, final Charset charset) {
[2/3] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by rp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c785f899
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c785f899
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c785f899
Branch: refs/heads/master
Commit: c785f899caf4c97f42d2117142631580fc1d56d0
Parents: c67ccb0 5a4c751
Author: rpopma <rp...@apache.org>
Authored: Sun Jul 12 14:19:34 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Jul 12 14:19:34 2015 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Level.java | 5 +-
.../java/org/apache/logging/log4j/Marker.java | 208 +-
log4j-bom/pom.xml | 2 +-
log4j-core/pom.xml | 1 +
.../core/appender/OutputStreamManager.java | 2 +-
.../rolling/DefaultRolloverStrategy.java | 143 +-
.../rolling/RolloverDescriptionImpl.java | 6 +-
.../rolling/action/Bzip2CompressAction.java | 131 -
.../rolling/action/CommonsCompressAction.java | 130 +
.../rolling/action/GzCompressAction.java | 10 +-
.../rolling/action/ZipCompressAction.java | 10 +-
.../core/config/AbstractConfiguration.java | 3 +-
.../plugins/processor/PluginProcessor.java | 5 +-
.../core/filter/DynamicThresholdFilter.java | 5 +-
.../logging/log4j/core/filter/MapFilter.java | 5 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 5 +-
.../logging/log4j/core/impl/ThrowableProxy.java | 18 +-
.../logging/log4j/core/layout/GelfLayout.java | 23 +-
.../core/pattern/DatePatternConverter.java | 91 +-
.../log4j/core/pattern/PatternParser.java | 5 +-
.../apache/logging/log4j/core/util/Loader.java | 1 -
.../log4j/core/util/datetime/DateParser.java | 102 +
.../log4j/core/util/datetime/DatePrinter.java | 127 +
.../core/util/datetime/FastDateFormat.java | 578 +++
.../core/util/datetime/FastDateParser.java | 926 ++++
.../core/util/datetime/FastDatePrinter.java | 1330 ++++++
.../log4j/core/util/datetime/Format.java | 28 +
.../log4j/core/util/datetime/FormatCache.java | 265 ++
log4j-core/src/site/xdoc/index.xml | 5 +-
.../apache/logging/log4j/core/LoggerTest.java | 1 -
...nsoleAppenderDefaultSuppressedThrowable.java | 6 +-
.../ConsoleAppenderNoAnsiStyleLayoutMain.java | 4 +-
.../log4j/core/appender/FileAppenderTest.java | 2 +-
.../core/appender/OutputStreamAppenderTest.java | 2 +-
.../rolling/RollingAppenderSizeTest.java | 4 +
.../rolling/action/Bzip2CompressActionTest.java | 240 +-
.../plugins/validation/ValidatingPlugin.java | 1 -
.../log4j/core/impl/ThrowableProxyTest.java | 22 +-
.../log4j/core/layout/LogEventFixtures.java | 1 -
.../log4j/core/layout/XmlLayoutTest.java | 1 -
.../log4j/core/selector/TestClassLoader.java | 2 +-
.../test/resources/log4j-rolling-deflate.xml | 59 +
.../test/resources/log4j-rolling-pack200.xml | 59 +
.../src/test/resources/log4j-rolling-xy.xml | 59 +
.../log4j/flume/appender/FlumeAvroManager.java | 4 +-
.../log4j/flume/appender/FlumeAppenderTest.java | 2 +-
.../log4j/jul/DefaultLevelConverter.java | 14 +-
...efaultLevelConverterCustomJulLevelsTest.java | 5 +-
.../nosql/appender/mongodb/MongoDbProvider.java | 2 +-
.../perf/jmh/SimpleDateFormatBenchmark.java | 92 +-
.../org/apache/logging/slf4j/Log4jMarker.java | 264 +-
.../apache/logging/slf4j/Log4jMarkerTest.java | 76 +-
.../org/apache/logging/slf4j/MarkerTest.java | 28 +-
pom.xml | 4 +-
src/changes/changes.xml | 4129 +++++++++---------
src/site/xdoc/manual/appenders.xml | 11 +-
src/site/xdoc/runtime-dependencies.xml | 5 +-
57 files changed, 6486 insertions(+), 2783 deletions(-)
----------------------------------------------------------------------