You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/11/18 23:29:16 UTC
[4/5] logging-log4j2 git commit: Wait for servers to shutdown to
avoid bind failures
Wait for servers to shutdown to avoid bind failures
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7d1d70c0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7d1d70c0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7d1d70c0
Branch: refs/heads/master
Commit: 7d1d70c035f7feeab6d9fd47406904bf60e6400d
Parents: 6ee21cb
Author: Ralph Goers <rg...@apache.org>
Authored: Sat Nov 18 16:23:56 2017 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Sat Nov 18 16:25:08 2017 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java | 5 +++++
.../apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7d1d70c0/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
index 92f7e81..54640f6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
@@ -40,6 +40,11 @@ public class MockTcpSyslogServer extends MockSyslogServer {
e.printStackTrace();
}
thread.interrupt();
+ try {
+ thread.join(100);
+ } catch (InterruptedException ie) {
+ System.out.println("Shutdown of server thread failed.");
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7d1d70c0/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
index 8f7fe73..7fbe340 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
@@ -37,6 +37,11 @@ public class MockUdpSyslogServer extends MockSyslogServer {
this.shutdown = true;
thread.interrupt();
socket.close();
+ try {
+ thread.join(100);
+ } catch (InterruptedException ie) {
+ System.out.println("Unable to shutdown server");
+ }
}
@Override