Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-211: Use ServerSocket.accept instead of ServerSocketChannel.accept so that timeout is taken into account

This commit is contained in:
Mark Payne 2014-12-30 08:59:10 -05:00
parent d27d2e303e
commit 0a0b7e05a0
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/SocketRemoteSiteListener.java
View File

@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.nio.channels.ServerSocketChannel;
@ -43,7 +44,6 @@ import org.apache.nifi.remote.io.socket.ssl.SSLSocketChannelCommunicationsSessio
import org.apache.nifi.remote.protocol.CommunicationsSession;
import org.apache.nifi.remote.protocol.RequestType;
import org.apache.nifi.remote.protocol.ServerProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -99,11 +99,20 @@ public class SocketRemoteSiteListener implements RemoteSiteListener {
continue;
}
LOG.trace("Accepting Connection...");
final SocketChannel socketChannel;
Socket acceptedSocket = null;
try {
serverSocketChannel.socket().setSoTimeout(5000);
socketChannel = serverSocketChannel.accept();
serverSocketChannel.configureBlocking(false);
final ServerSocket serverSocket = serverSocketChannel.socket();
serverSocket.setSoTimeout(2000);
while ( !stopped.get() && acceptedSocket == null ) {
try {
acceptedSocket = serverSocket.accept();
} catch (final SocketTimeoutException ste) {
continue;
}
}
} catch (final IOException e) {
LOG.error("RemoteSiteListener Unable to accept connection due to {}", e.toString());
if ( LOG.isDebugEnabled() ) {
@ -113,12 +122,11 @@ public class SocketRemoteSiteListener implements RemoteSiteListener {
}
LOG.trace("Got connection");
final Socket socket = acceptedSocket;
final SocketChannel socketChannel = socket.getChannel();
final Thread thread = new Thread(new Runnable() {
@Override
public void run() {
final Socket socket = socketChannel.socket();
String hostname = socket.getInetAddress().getHostName();
final int slashIndex = hostname.indexOf("/");
if ( slashIndex == 0 ) {