Add some flow logging and pull up LOGGER up to the top of a hierarchy. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c77be59e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c77be59e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c77be59e
Branch: refs/heads/LOG4J-1181 Commit: c77be59edf691f8912b0536bb5c0f7c5e386c310 Parents: d7bc722 Author: ggregory <[email protected]> Authored: Mon Nov 2 02:27:36 2015 -0800 Committer: ggregory <[email protected]> Committed: Mon Nov 2 02:27:36 2015 -0800 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/LogEventListener.java | 3 +++ .../apache/logging/log4j/core/net/server/JmsServer.java | 1 - .../logging/log4j/core/net/server/TcpSocketServer.java | 12 +++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c77be59e/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java index dd93fc3..1128736 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java @@ -18,12 +18,15 @@ package org.apache.logging.log4j.core; import java.util.EventListener; +import org.apache.logging.log4j.status.StatusLogger; + /** * Base class for server classes that listen to {@link LogEvent}s. * TODO (MS) How is this class any different from Appender? */ public class LogEventListener implements EventListener { + protected static final StatusLogger LOGGER = StatusLogger.getLogger(); private final LoggerContext context; protected LogEventListener() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c77be59e/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java index f715495..7158d8d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java @@ -40,7 +40,6 @@ import org.apache.logging.log4j.status.StatusLogger; */ public class JmsServer extends LogEventListener implements MessageListener, LifeCycle { - private static final Logger LOGGER = StatusLogger.getLogger(); private final AtomicReference<State> state = new AtomicReference<>(State.INITIALIZED); private final JmsManager jmsManager; private MessageConsumer messageConsumer; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c77be59e/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java index 3955260..93e02be 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java @@ -132,7 +132,9 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer * if an I/O error occurs when opening the socket. */ public static TcpSocketServer<InputStream> createJsonSocketServer(final int port) throws IOException { - return new TcpSocketServer<>(port, new JsonInputStreamLogEventBridge()); + LOGGER.entry("createJsonSocketServer", port); + final TcpSocketServer<InputStream> socketServer = new TcpSocketServer<>(port, new JsonInputStreamLogEventBridge()); + return LOGGER.exit(socketServer); } /** @@ -145,7 +147,9 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer * if an I/O error occurs when opening the socket. */ public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port) throws IOException { - return new TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge()); + LOGGER.entry(port); + final TcpSocketServer<ObjectInputStream> socketServer = new TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge()); + return LOGGER.exit(socketServer); } /** @@ -158,7 +162,9 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer * if an I/O error occurs when opening the socket. */ public static TcpSocketServer<InputStream> createXmlSocketServer(final int port) throws IOException { - return new TcpSocketServer<>(port, new XmlInputStreamLogEventBridge()); + LOGGER.entry(port); + final TcpSocketServer<InputStream> socketServer = new TcpSocketServer<>(port, new XmlInputStreamLogEventBridge()); + return LOGGER.exit(socketServer); } /**
