bitmessage/Jabit
bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Synchronisation API - added option to wait for the synchronization to finish

Browse Source
This commit is contained in:
Christian Basler 2015-10-08 13:12:39 +02:00
parent f9ff22bebe
commit ea1419eda1
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
View File

@ -192,8 +192,22 @@ public class BitmessageContext {
ctx.getNetworkHandler().stop();
}
public void synchronize(InetAddress host, int port, long timeoutInSeconds) {
ctx.getNetworkHandler().synchronize(host, port, networkListener, timeoutInSeconds);
/**
* @param host a trusted node that must be reliable (it's used for every synchronization)
* @param port of the trusted host, default is 8444
* @param timeoutInSeconds synchronization should end no later than about 5 seconds after the timeout elapsed, even
* if not all objects were fetched
* @param wait waits for the synchronization thread to finish
*/
public void synchronize(InetAddress host, int port, long timeoutInSeconds, boolean wait) {
Thread t = ctx.getNetworkHandler().synchronize(host, port, networkListener, timeoutInSeconds);
if (wait) {
try {
t.join();
} catch (InterruptedException e) {
throw new RuntimeException(e.getMessage(), e);
}
}
}
public void cleanup() {

2
networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
View File

@ -204,6 +204,7 @@ public class Connection implements Runnable {
return false;
}
if (syncTimeout < UnixTime.now()) {
LOG.info("Synchronization timed out");
return true;
}
if (msg == null) {
@ -213,6 +214,7 @@ public class Connection implements Runnable {
readTimeoutCounter = 0;
if (!(msg.getPayload() instanceof Addr) && !(msg.getPayload() instanceof GetData)
&& requestedObjects.isEmpty() && sendingQueue.isEmpty()) {
LOG.info("Synchronisation completed");
return true;
}
return false;