mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add socket timeout

Browse Source
This commit is contained in:
Manfred Karrer 2015-11-10 17:48:41 +01:00
parent 6b89f19927
commit 3c3a148b57
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/src/main/java/io/bitsquare/p2p/network/Connection.java
View File

@ -45,7 +45,8 @@ public class Connection implements MessageListener {
private final ConnectionListener connectionListener;
private final String portInfo;
private final String uid;
private final String uid = UUID.randomUUID().toString();
;
private final ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
// set in init
@ -75,7 +76,6 @@ public class Connection implements MessageListener {
this.connectionListener = connectionListener;
Log.traceCall();
uid = UUID.randomUUID().toString();
if (socket.getLocalPort() == 0)
portInfo = "port=" + socket.getPort();
else
@ -131,7 +131,7 @@ public class Connection implements MessageListener {
if (!stopped) {
try {
log.info("\n\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" +
"Write object to outputStream to peer: {} ({objectId=})\nmessage={}"
"Write object to outputStream to peer: {} (uid={})\nmessage={}"
+ "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n", getPeerAddress(), uid, message);
Object objectToWrite;

24
network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
View File

@ -15,10 +15,9 @@ import java.io.IOException;
import java.net.ConnectException;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.*;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.TimeoutException;
import static com.google.common.base.Preconditions.checkNotNull;
@ -26,7 +25,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
public abstract class NetworkNode implements MessageListener, ConnectionListener {
private static final Logger log = LoggerFactory.getLogger(NetworkNode.class);
private static final int CREATE_SOCKET_TIMEOUT = 1 * 1000; // 10 sec.
private static final int CREATE_SOCKET_TIMEOUT = 10 * 1000; // 10 sec.
protected final int servicePort;
@ -92,6 +91,7 @@ public abstract class NetworkNode implements MessageListener, ConnectionListener
"We will create a new outbound connection.");
final SettableFuture<Connection> resultFuture = SettableFuture.create();
ListenableFuture<Connection> future = executorService.submit(() -> {
Thread.currentThread().setName("NetworkNode:SendMessage-to-" + peerAddress);
try {
@ -117,19 +117,35 @@ public abstract class NetworkNode implements MessageListener, ConnectionListener
throw throwable;
}
});
Timer timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
Thread.currentThread().setName("TimerTask-" + new Random().nextInt(10000));
future.cancel(true);
String message = "Timeout occurred when trying to create Socket.";
log.warn(message);
resultFuture.setException(new TimeoutException(message));
}
}, CREATE_SOCKET_TIMEOUT);
Futures.addCallback(future, new FutureCallback<Connection>() {
public void onSuccess(Connection connection) {
UserThread.execute(() -> {
timer.cancel();
resultFuture.set(connection);
});
}
public void onFailure(@NotNull Throwable throwable) {
UserThread.execute(() -> {
timer.cancel();
resultFuture.setException(throwable);
});
}
});
return resultFuture;
}
}