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 2016/03/08 22:23:07 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1160 AsyncLoggerDisruptor
should not log status message at FATAL level when logging is attempted after
the Disruptor was shut down
Repository: logging-log4j2
Updated Branches:
refs/heads/master 95294481e -> a47a22484
LOG4J2-1160 AsyncLoggerDisruptor should not log status message at FATAL level when logging is attempted after the Disruptor was shut down
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6207ea6b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6207ea6b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6207ea6b
Branch: refs/heads/master
Commit: 6207ea6b8545e89ca82e39b09d3552b8d638e0f4
Parents: f1e5063
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 9 08:22:36 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 9 08:22:36 2016 +1100
----------------------------------------------------------------------
.../apache/logging/log4j/core/async/AsyncLoggerDisruptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6207ea6b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
index 1188b73..c55e1c9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
@@ -179,7 +179,7 @@ class AsyncLoggerDisruptor {
*/
private boolean hasLog4jBeenShutDown(final Disruptor<RingBufferLogEvent> aDisruptor) {
if (aDisruptor == null) { // LOG4J2-639
- LOGGER.fatal("Ignoring log event after log4j was shut down");
+ LOGGER.error("Ignoring log event after log4j was shut down");
return true;
}
return false;
@@ -193,7 +193,7 @@ class AsyncLoggerDisruptor {
// was shut down, which could cause the publishEvent method to hang and never return.
disruptor.publishEvent(translator);
} catch (final NullPointerException npe) {
- LOGGER.fatal("[{}] Ignoring log event after log4j was shut down.", contextName);
+ LOGGER.error("[{}] Ignoring log event after log4j was shut down.", contextName);
}
}
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a47a2248
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a47a2248
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a47a2248
Branch: refs/heads/master
Commit: a47a2248425e744cb9f4203029f9da89cc8ec900
Parents: 6207ea6 9529448
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 9 08:22:58 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 9 08:22:58 2016 +1100
----------------------------------------------------------------------
.../apache/logging/log4j/EventLoggerTest.java | 2 +-
.../apache/logging/log4j/LambdaLoggerTest.java | 3 +--
.../logging/log4j/core/LoggerContext.java | 2 ++
.../logging/log4j/core/lookup/JndiLookup.java | 2 +-
.../logging/log4j/core/LoggerUpdateTest.java | 15 +++++++++++++
.../rolling/RollingAppenderSizeTest.java | 15 +++++--------
.../log4j/core/lookup/JndiLookupTest.java | 18 ++++++++++++++++
.../core/pattern/DatePatternConverterTest.java | 2 +-
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../log4j/test/appender/AlwaysFailAppender.java | 11 ++++------
.../log4j/test/appender/DeadlockAppender.java | 13 ++++--------
.../log4j/test/appender/FailOnceAppender.java | 13 ++++--------
.../log4j/test/appender/InMemoryAppender.java | 2 --
.../log4j/test/appender/ListAppender.java | 6 +-----
.../test/appender/UsesLoggingAppender.java | 22 +++++++-------------
.../log4j/web/Log4jWebInitializerImpl.java | 5 +++--
src/changes/changes.xml | 14 ++++++++++++-
src/site/xdoc/manual/configuration.xml.vm | 4 ++++
18 files changed, 85 insertions(+), 66 deletions(-)
----------------------------------------------------------------------