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/03/11 15:23:38 UTC
[09/21] 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 (status message at
WARN level instead)
LOG4J2-1160 AsyncLoggerConfigDisruptor should not log status message at FATAL level when logging is attempted after the Disruptor was shut down (status message at WARN level instead)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bf079501
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bf079501
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bf079501
Branch: refs/heads/gelf-layout-gc-free
Commit: bf0795017628d9f5bf969bd420c4e458d4b72d90
Parents: c2187bc
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 9 08:29:05 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 9 08:29:05 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/bf079501/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 dc6d296..20e025c 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.error("Ignoring log event after log4j was shut down");
+ LOGGER.warn("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.error("Ignoring log event after log4j was shut down.");
+ LOGGER.warn("Ignoring log event after log4j was shut down.");
}
}