diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java b/logback-core/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java index 2940f473f16c7e37342068869fb99f45cebc0fec..a2d4a8bad07c76632002a3fc7accc0dbbf6d6e2e 100755 --- a/logback-core/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/net/AbstractSocketAppender.java @@ -21,9 +21,7 @@ import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; import java.util.concurrent.BlockingDeque; -import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import javax.net.SocketFactory; @@ -88,7 +86,6 @@ public abstract class AbstractSocketAppender extends AppenderBase private BlockingDeque deque; private String peerId; private Future task; - private Future connectorTask; private volatile Socket socket; @@ -166,8 +163,6 @@ public abstract class AbstractSocketAppender extends AppenderBase if (!isStarted()) return; CloseUtil.closeQuietly(socket); task.cancel(true); - if(connectorTask != null) - connectorTask.cancel(true); super.stop(); } @@ -191,14 +186,9 @@ public abstract class AbstractSocketAppender extends AppenderBase private void connectSocketAndDispatchEvents() { try { while (!Thread.currentThread().isInterrupted()) { - SocketConnector connector = createConnector(address, port, 0, - reconnectionDelay.getMilliseconds()); + SocketConnector connector = createConnector(address, port, 0, reconnectionDelay.getMilliseconds()); - connectorTask = activateConnector(connector); - if(connectorTask == null) - break; - - socket = waitForConnectorToReturnSocket(); + socket = connector.call(); if(socket == null) break; @@ -237,24 +227,6 @@ public abstract class AbstractSocketAppender extends AppenderBase return connector; } - private Future activateConnector(SocketConnector connector) { - try { - return getContext().getExecutorService().submit(connector); - } catch (RejectedExecutionException ex) { - return null; - } - } - - private Socket waitForConnectorToReturnSocket() throws InterruptedException { - try { - Socket s = connectorTask.get(); - connectorTask = null; - return s; - } catch (ExecutionException e) { - return null; - } - } - private void dispatchEvents(ObjectWriter objectWriter) throws InterruptedException, IOException { while (true) { E event = deque.takeFirst(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderTest.java b/logback-core/src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderTest.java index 90e5cc3153ddfffdfedd1fd9c9c3b9968a253907..1622089f91fa845b0a726b49fadca5c55f4963e9 100755 --- a/logback-core/src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderTest.java @@ -21,7 +21,6 @@ import java.net.InetAddress; import java.net.Socket; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -32,6 +31,7 @@ import org.junit.After; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.mockito.InOrder; import static org.mockito.Matchers.any; @@ -242,32 +242,6 @@ public class AbstractSocketAppenderTest { verify(appender, timeout(TIMEOUT).atLeastOnce()).addInfo(contains("connection closed")); } - @Test - public void shutsDownWhenConnectorTaskCouldNotBeActivated() { - - // given - doThrow(new RejectedExecutionException()).when(executorService).submit(socketConnector); - - // when - appender.start(); - - // then - verify(appender, timeout(TIMEOUT)).addInfo("shutting down"); - } - - @Test - public void shutsDownWhenConnectorTaskThrewAnException() throws Exception { - - // given - doThrow(new IllegalStateException()).when(socketConnector).call(); - - // when - appender.start(); - - // then - verify(appender, timeout(TIMEOUT)).addInfo("shutting down"); - } - @Test public void offersEventsToTheEndOfTheDeque() throws Exception {