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/16 14:38:27 UTC
[10/50] logging-log4j2 git commit: LOG4J2-1160
AsyncLoggerConfigDisruptor should not log status message at FATAL level when
logging is attempted after the Disruptor was shut down
LOG4J2-1160 AsyncLoggerConfigDisruptor 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/c2187bc6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c2187bc6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c2187bc6
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: c2187bc69ad1112319e6339290c52d7a557c3e96
Parents: a47a224
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 9 08:24:03 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 9 08:24:03 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/core/async/AsyncLoggerConfigDisruptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c2187bc6/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
index f536d79..dc6d296 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
@@ -245,7 +245,7 @@ public class AsyncLoggerConfigDisruptor implements AsyncLoggerConfigDelegate {
*/
private boolean hasLog4jBeenShutDown(final Disruptor<Log4jEventWrapper> 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;
@@ -260,7 +260,7 @@ public class AsyncLoggerConfigDisruptor implements AsyncLoggerConfigDelegate {
} catch (final NullPointerException npe) {
// Note: NPE prevents us from adding a log event to the disruptor after it was shut down,
// which could cause the publishEvent method to hang and never return.
- LOGGER.fatal("Ignoring log event after log4j was shut down.");
+ LOGGER.error("Ignoring log event after log4j was shut down.");
}
}