Add some flow logging. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/633672cc Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/633672cc Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/633672cc
Branch: refs/heads/LOG4J-1181 Commit: 633672cc8a0f9e9681c33fdc08462c64a222e484 Parents: 35b9384 Author: ggregory <[email protected]> Authored: Mon Nov 2 02:48:20 2015 -0800 Committer: ggregory <[email protected]> Committed: Mon Nov 2 02:48:20 2015 -0800 ---------------------------------------------------------------------- .../logging/log4j/core/net/server/TcpSocketServer.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/633672cc/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 34d9bea..72e2e4e 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 @@ -55,6 +55,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer @Override public void run() { + logger.entry(); boolean closed = false; try { try { @@ -78,6 +79,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer } finally { handlers.remove(Long.valueOf(getId())); } + logger.exit(); } public void shutdown() { @@ -215,13 +217,16 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer */ @Override public void run() { + logger.entry(); while (isActive()) { if (serverSocket.isClosed()) { return; } try { // Accept incoming connections. + logger.debug("Socket accept()..."); final Socket clientSocket = serverSocket.accept(); + logger.debug("Socket accepted: {}", clientSocket); clientSocket.setSoLinger(true, 0); // accept() will block until a client connects to the server. @@ -234,6 +239,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer } catch (final IOException e) { if (serverSocket.isClosed()) { // OK we're done. + logger.exit(); return; } logger.error("Exception encountered on accept. Ignoring. Stack Trace :", e); @@ -248,6 +254,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer // Ignore the exception } } + logger.exit(); } /** @@ -256,8 +263,10 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer * @throws IOException if the server socket could not be closed */ public void shutdown() throws IOException { + logger.entry(); setActive(false); Thread.currentThread().interrupt(); serverSocket.close(); + logger.exit(); } }
