Repository: logging-log4j2 Updated Branches: refs/heads/master 97298d37f -> fef375e89
Access static method directly. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fef375e8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fef375e8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fef375e8 Branch: refs/heads/master Commit: fef375e896fd463accc4ccf9ddbab3e585376917 Parents: 97298d3 Author: Gary Gregory <[email protected]> Authored: Thu Jan 4 12:21:50 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Jan 4 12:21:50 2018 -0700 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/appender/AsyncAppender.java | 3 ++- .../java/org/apache/logging/log4j/core/async/AsyncLogger.java | 5 +++-- .../org/apache/logging/log4j/core/async/AsyncLoggerConfig.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fef375e8/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java index bc2be90..92561d9 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java @@ -52,6 +52,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.util.Log4jThread; import org.apache.logging.log4j.message.Message; +import org.apache.logging.log4j.spi.AbstractLogger; /** * Appends to one or more Appenders asynchronously. You can configure an AsyncAppender with one or more Appenders and an @@ -161,7 +162,7 @@ public final class AsyncAppender extends AbstractAppender { InternalAsyncUtil.makeMessageImmutable(logEvent.getMessage()); if (!transfer(memento)) { if (blocking) { - if (Logger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 + if (AbstractLogger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 // If queue is full AND we are in a recursive call, call appender directly to prevent deadlock final Message message = AsyncQueueFullMessageUtil.transform(logEvent.getMessage()); logMessageInCurrentThread(new Log4jLogEvent.Builder(logEvent).setMessage(message).build()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fef375e8/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java index 84d66dd..036a130 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java @@ -36,6 +36,7 @@ import org.apache.logging.log4j.core.util.NanoClock; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.message.ReusableMessage; +import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.StackLocatorUtil; import org.apache.logging.log4j.util.StringMap; @@ -167,7 +168,7 @@ public class AsyncLogger extends Logger implements EventTranslatorVararg<RingBuf } private void handleRingBufferFull(final RingBufferLogEventTranslator translator) { - if (Logger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 + if (AbstractLogger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 // If queue is full AND we are in a recursive call, call appender directly to prevent deadlock final Message message = AsyncQueueFullMessageUtil.transform(translator.message); logMessageInCurrentThread(translator.fqcn, translator.level, translator.marker, message, @@ -318,7 +319,7 @@ public class AsyncLogger extends Logger implements EventTranslatorVararg<RingBuf final Marker marker, final Message msg, final Throwable thrown) { - if (Logger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 + if (AbstractLogger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 // If queue is full AND we are in a recursive call, call appender directly to prevent deadlock final Message message = AsyncQueueFullMessageUtil.transform(msg); logMessageInCurrentThread(fqcn, level, marker, message, thrown); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fef375e8/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java index d6e46b5..36f422f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java @@ -40,6 +40,7 @@ import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.jmx.RingBufferAdmin; import org.apache.logging.log4j.core.util.Booleans; import org.apache.logging.log4j.message.Message; +import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.util.Strings; /** @@ -100,7 +101,7 @@ public class AsyncLoggerConfig extends LoggerConfig { } private void handleQueueFull(final LogEvent event) { - if (Logger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 + if (AbstractLogger.getRecursionDepth() > 1) { // LOG4J2-1518, LOG4J2-2031 // If queue is full AND we are in a recursive call, call appender directly to prevent deadlock final Message message = AsyncQueueFullMessageUtil.transform(event.getMessage()); callAppendersInCurrentThread(new Log4jLogEvent.Builder(event).setMessage(message).build());
