[3/8] logging-log4j2 git commit: LOG4J2-2318: AsyncQueueFullMessageUtil logs to StatusLogger
LOG4J2-2318: AsyncQueueFullMessageUtil logs to StatusLogger
We no longer mutate messages when logging them out of order.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e2287046
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e2287046
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e2287046
Branch: refs/heads/release-2.x
Commit: e228704684b94bbb3d785f4e55753b091eed9548
Parents: bc4bf6d
Author: Carter Kozak
Authored: Mon Apr 16 12:06:39 2018 -0400
Committer: Carter Kozak
Committed: Tue Apr 24 09:17:02 2018 -0400
--
.../log4j/core/appender/AsyncAppender.java | 5 ++--
.../logging/log4j/core/async/AsyncLogger.java | 8 +++---
.../log4j/core/async/AsyncLoggerConfig.java | 4 +--
.../core/async/AsyncQueueFullMessageUtil.java | 29
...syncLoggerConfigLoggingFromToStringTest.java | 15 --
...eFullAsyncLoggerLoggingFromToStringTest.java | 4 +--
6 files changed, 34 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e2287046/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 92e6738..ba51f49 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
@@ -50,7 +50,6 @@ import
org.apache.logging.log4j.core.config.plugins.PluginElement;
import
org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
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;
/**
@@ -163,8 +162,8 @@ public final class AsyncAppender extends AbstractAppender {
if (blocking) {
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());
+AsyncQueueFullMessageUtil.logWarningToStatusLogger();
+logMessageInCurrentThread(logEvent);
} else {
// delegate to the event router (which may discard,
enqueue and block, or log in current thread)
final EventRoute route =
asyncQueueFullPolicy.getRoute(thread.getId(), memento.getLevel());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e2287046/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 358422c..3bbdc41 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
@@ -170,8 +170,8 @@ public class AsyncLogger extends Logger implements
EventTranslatorVararg 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,
+AsyncQueueFullMessageUtil.logWarningToStatusLogger();
+logMessageInCurrentThread(translator.fqcn, translator.level,
translator.marker, translator.message,
translator.thrown);
return;
}
@@ -321,8 +321,8 @@ public class AsyncLogger extends Logger implements
EventTranslatorVararg 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);
+AsyncQueueFullMessageUtil.logWarningToStatusLogger();
+logMessageInCurrentThread(fqcn, level, marker, msg, thrown);
return;
logging-log4j2 git commit: LOG4J2-2318: AsyncQueueFullMessageUtil logs to StatusLogger
Repository: logging-log4j2
Updated Branches:
refs/heads/master 7379ec33e -> d175b2b2e
LOG4J2-2318: AsyncQueueFullMessageUtil logs to StatusLogger
We no longer mutate messages when logging them out of order.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d175b2b2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d175b2b2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d175b2b2
Branch: refs/heads/master
Commit: d175b2b2ee7748bff5456a6f339556cbb3a5e275
Parents: 7379ec3
Author: Carter Kozak
Authored: Mon Apr 16 12:06:39 2018 -0400
Committer: Carter Kozak
Committed: Mon Apr 16 22:57:50 2018 -0400
--
.../log4j/core/appender/AsyncAppender.java | 5 ++--
.../logging/log4j/core/async/AsyncLogger.java | 8 +++---
.../log4j/core/async/AsyncLoggerConfig.java | 4 +--
.../core/async/AsyncQueueFullMessageUtil.java | 29
...syncLoggerConfigLoggingFromToStringTest.java | 15 --
...eFullAsyncLoggerLoggingFromToStringTest.java | 4 +--
src/changes/changes.xml | 3 ++
7 files changed, 37 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d175b2b2/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 92e6738..ba51f49 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
@@ -50,7 +50,6 @@ import
org.apache.logging.log4j.core.config.plugins.PluginElement;
import
org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
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;
/**
@@ -163,8 +162,8 @@ public final class AsyncAppender extends AbstractAppender {
if (blocking) {
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());
+AsyncQueueFullMessageUtil.logWarningToStatusLogger();
+logMessageInCurrentThread(logEvent);
} else {
// delegate to the event router (which may discard,
enqueue and block, or log in current thread)
final EventRoute route =
asyncQueueFullPolicy.getRoute(thread.getId(), memento.getLevel());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d175b2b2/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 8f86588..c278316 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
@@ -170,8 +170,8 @@ public class AsyncLogger extends Logger implements
EventTranslatorVararg 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,
+AsyncQueueFullMessageUtil.logWarningToStatusLogger();
+logMessageInCurrentThread(translator.fqcn, translator.level,
translator.marker, translator.message,
translator.thrown);
return;
}
@@ -321,8 +321,8 @@ public class AsyncLogger extends Logger implements
EventTranslatorVararg 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);
+AsyncQue
