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 2016/04/18 02:26:40 UTC
[4/8] logging-log4j2 git commit: Fix per Matt's comments on the ML.
Fix per Matt's comments on the ML.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a990c752
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a990c752
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a990c752
Branch: refs/heads/master
Commit: a990c75251bdc28123b48ceb67e54f7face71af7
Parents: 7380b27
Author: ggregory <gg...@apache.org>
Authored: Sun Apr 17 17:03:45 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Apr 17 17:03:45 2016 -0700
----------------------------------------------------------------------
.../log4j/core/net/server/TcpSocketServer.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a990c752/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 9103a01..f32fbe8 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
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.util.Log4jThread;
+import org.apache.logging.log4j.message.EntryMessage;
/**
* Listens for events over a socket connection.
@@ -56,7 +57,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
@Override
public void run() {
- logger.traceEntry();
+ final EntryMessage entry = logger.traceEntry();
boolean closed = false;
try {
try {
@@ -80,7 +81,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
} finally {
handlers.remove(Long.valueOf(getId()));
}
- logger.traceExit();
+ logger.traceExit(entry);
}
public void shutdown() {
@@ -218,7 +219,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
*/
@Override
public void run() {
- logger.traceEntry();
+ final EntryMessage entry = logger.traceEntry();
while (isActive()) {
if (serverSocket.isClosed()) {
return;
@@ -240,14 +241,14 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
} catch (final IOException e) {
if (serverSocket.isClosed()) {
// OK we're done.
- logger.traceExit();
+ logger.traceExit(entry);
return;
}
logger.error("Exception encountered on accept. Ignoring. Stack Trace :", e);
}
}
- for (final Map.Entry<Long, SocketHandler> entry : handlers.entrySet()) {
- final SocketHandler handler = entry.getValue();
+ for (final Map.Entry<Long, SocketHandler> handlerEntry : handlers.entrySet()) {
+ final SocketHandler handler = handlerEntry.getValue();
handler.shutdown();
try {
handler.join();
@@ -255,7 +256,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
// Ignore the exception
}
}
- logger.traceExit();
+ logger.traceExit(entry);
}
/**
@@ -264,10 +265,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.traceEntry();
+ final EntryMessage entry = logger.traceEntry();
setActive(false);
Thread.currentThread().interrupt();
serverSocket.close();
- logger.traceExit();
+ logger.traceExit(entry);
}
}