You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/10/27 15:11:23 UTC
git commit: Testing [LOG4J2-886] Not serializing the exception or
ThreadContext (MDC).
Repository: logging-log4j2
Updated Branches:
refs/heads/master b9a7d46b4 -> 88329b77d
Testing [LOG4J2-886] Not serializing the exception or ThreadContext
(MDC).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/88329b77
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/88329b77
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/88329b77
Branch: refs/heads/master
Commit: 88329b77deab168fc869f76827762a2497c0f0c2
Parents: b9a7d46
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Oct 27 10:10:21 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Oct 27 10:10:21 2014 -0400
----------------------------------------------------------------------
.../logging/log4j/core/appender/SocketAppenderTest.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/88329b77/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index c37d17a..4af810c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -113,8 +113,9 @@ public class SocketAppenderTest {
root.setAdditive(false);
root.setLevel(Level.DEBUG);
String tcKey = "UUID";
- String expectedUuid = UUID.randomUUID().toString();
- ThreadContext.put(tcKey, expectedUuid);
+ String expectedUuidStr = UUID.randomUUID().toString();
+ ThreadContext.put(tcKey, expectedUuidStr);
+ ThreadContext.push(expectedUuidStr);
try {
root.debug("This is a test message");
final Throwable child = new LoggingException("This is a test");
@@ -122,17 +123,19 @@ public class SocketAppenderTest {
root.debug("This is another test message");
} finally {
ThreadContext.remove(tcKey);
+ ThreadContext.pop();
}
Thread.sleep(250);
LogEvent event = list.poll(3, TimeUnit.SECONDS);
assertNotNull("No event retrieved", event);
assertTrue("Incorrect event", event.getMessage().getFormattedMessage().equals("This is a test message"));
assertTrue("Message not delivered via TCP", tcpCount > 0);
- assertEquals(expectedUuid, event.getContextMap().get(tcKey));
+ assertEquals(expectedUuidStr, event.getContextMap().get(tcKey));
event = list.poll(3, TimeUnit.SECONDS);
assertNotNull("No event retrieved", event);
assertTrue("Incorrect event", event.getMessage().getFormattedMessage().equals("Throwing an exception"));
assertTrue("Message not delivered via TCP", tcpCount > 1);
+ assertEquals(expectedUuidStr, event.getContextStack().pop());
}
@Test
@@ -268,5 +271,5 @@ public class SocketAppenderTest {
}
}
}
-
+
}