Repository: logging-log4j2 Updated Branches: refs/heads/master 52e0761ee -> fb6afac6f
Another approach to fix the test Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fb6afac6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fb6afac6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fb6afac6 Branch: refs/heads/master Commit: fb6afac6fc118cb511fe317b0cda0003058a4dc6 Parents: 52e0761 Author: Ralph Goers <[email protected]> Authored: Sat Nov 18 18:46:42 2017 -0700 Committer: Ralph Goers <[email protected]> Committed: Sat Nov 18 18:46:42 2017 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/SyslogAppenderTest.java | 34 +++++--------------- .../core/net/mock/MockTcpSyslogServer.java | 13 +++++--- 2 files changed, 16 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fb6afac6/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java index f034b0f..741a51f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java @@ -17,7 +17,6 @@ package org.apache.logging.log4j.core.appender; import java.io.IOException; -import java.net.BindException; import java.net.SocketException; import org.apache.logging.log4j.core.appender.SyslogAppender.Builder; @@ -48,7 +47,6 @@ public class SyslogAppenderTest extends SyslogAppenderTestBase { if (syslogServer != null) { syslogServer.shutdown(); } - syslogServer = null; } @Test @@ -95,46 +93,30 @@ public class SyslogAppenderTest extends SyslogAppenderTestBase { protected void initUDPTestEnvironment(final String messageFormat) throws SocketException { syslogServer = MockSyslogServerFactory.createUDPSyslogServer(1, PORTNUM); syslogServer.start(); - initAppender("udp", messageFormat, PORTNUM); + initAppender("udp", messageFormat); } protected void initTCPTestEnvironment(final String messageFormat) throws IOException { - int port = PORTNUM; - while (syslogServer == null) { - try { - syslogServer = MockSyslogServerFactory.createTCPSyslogServer(1, port); - } catch (BindException be) { - ++port; - if (port > 65535) { - throw be; - } - } - } - + syslogServer = MockSyslogServerFactory.createTCPSyslogServer(1, PORTNUM); syslogServer.start(); - initAppender("tcp", messageFormat, port); + initAppender("tcp", messageFormat); } - protected void initAppender(final String transportFormat, final String messageFormat, int port) { - appender = createAppender(transportFormat, messageFormat, port); + protected void initAppender(final String transportFormat, final String messageFormat) { + appender = createAppender(transportFormat, messageFormat); validate(appender); appender.start(); initRootLogger(appender); } - protected SyslogAppender createAppender(final String protocol, final String format, int port) { - return newSyslogAppenderBuilder(protocol, format, includeNewLine, port).build(); + protected SyslogAppender createAppender(final String protocol, final String format) { + return newSyslogAppenderBuilder(protocol, format, includeNewLine).build(); } protected Builder newSyslogAppenderBuilder(final String protocol, final String format, final boolean newLine) { - return newSyslogAppenderBuilder(protocol, format, newLine, PORTNUM); - } - - protected Builder newSyslogAppenderBuilder(final String protocol, final String format, final boolean newLine, - int port) { // @formatter:off return SyslogAppender.newSyslogAppenderBuilder() - .withPort(port) + .withPort(PORTNUM) .withProtocol(EnglishEnums.valueOf(Protocol.class, protocol)) .withReconnectDelayMillis(-1) .withName("TestApp") http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fb6afac6/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 54640f6..17a9dfb 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 @@ -53,9 +53,10 @@ public class MockTcpSyslogServer extends MockSyslogServer { while (!shutdown) { try { final byte[] buffer = new byte[4096]; - final Socket socket = sock.accept(); - socket.setSoLinger(true, 0); - if (socket != null) { + Socket socket = null; + try { + socket = sock.accept(); + socket.setSoLinger(true, 0); final InputStream in = socket.getInputStream(); int i = in.read(buffer, 0, buffer.length); while (i != -1) { @@ -69,8 +70,10 @@ public class MockTcpSyslogServer extends MockSyslogServer { System.out.println("Message too long"); } } - - socket.close(); + } finally { + if (socket != null) { + socket.close(); + } } } catch (final Exception ex) { if (!shutdown) {
