You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/03/03 04:35:00 UTC
logging-log4j2 git commit: Add test for LOG4J2-1252.
Repository: logging-log4j2
Updated Branches:
refs/heads/master a6af67c5d -> 75fb3b9c7
Add test for LOG4J2-1252.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/75fb3b9c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/75fb3b9c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/75fb3b9c
Branch: refs/heads/master
Commit: 75fb3b9c7c45b8aa53dd408152e2761debc68457
Parents: a6af67c
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Mar 2 21:34:55 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Mar 2 21:34:55 2016 -0600
----------------------------------------------------------------------
.../log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java | 6 +++++-
log4j-core/src/test/resources/JeroMqAppenderTest.xml | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/75fb3b9c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
index ee9c700..385d63d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.AfterClass;
@@ -49,7 +50,7 @@ public class JeroMqAppenderTest {
@Test(timeout = 10000)
public void testClientServer() throws Exception {
final JeroMqAppender appender = ctx.getRequiredAppender("JeroMQAppender", JeroMqAppender.class);
- final int expectedReceiveCount = 2;
+ final int expectedReceiveCount = 3;
final JeroMqTestClient client = new JeroMqTestClient(JeroMqAppender.getContext(), "tcp://localhost:5556", expectedReceiveCount);
final ExecutorService executor = Executors.newSingleThreadExecutor();
try {
@@ -59,11 +60,14 @@ public class JeroMqAppenderTest {
appender.resetSendRcs();
logger.info("Hello");
logger.info("Again");
+ ThreadContext.put("foo", "bar");
+ logger.info("World");
final List<String> list = future.get();
Assert.assertEquals(expectedReceiveCount, appender.getSendRcTrue());
Assert.assertEquals(0, appender.getSendRcFalse());
Assert.assertEquals("Hello", list.get(0));
Assert.assertEquals("Again", list.get(1));
+ Assert.assertEquals("barWorld", list.get(2));
} finally {
executor.shutdown();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/75fb3b9c/log4j-core/src/test/resources/JeroMqAppenderTest.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/JeroMqAppenderTest.xml b/log4j-core/src/test/resources/JeroMqAppenderTest.xml
index a72a4f7..2a9d84d 100644
--- a/log4j-core/src/test/resources/JeroMqAppenderTest.xml
+++ b/log4j-core/src/test/resources/JeroMqAppenderTest.xml
@@ -20,6 +20,7 @@
<JeroMQ name="JeroMQAppender">
<Property name="endpoint">tcp://*:5556</Property>
<Property name="endpoint">ipc://info-topic</Property>
+ <PatternLayout pattern="%X{foo}%m"/>
</JeroMQ>
</Appenders>
<Loggers>
@@ -27,4 +28,4 @@
<AppenderRef ref="JeroMQAppender"/>
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>