laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-10 08:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

close connecting sockets and interrupt read thread on shutdown

Browse Source
This commit is contained in:
Craig Raw
2022-11-16 08:16:56 +02:00
parent a05fcba6d9
commit 0260a12663
10 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
+12 -2
View File
@@ -1063,6 +1063,7 @@ public class ElectrumServer {
private final ReentrantLock bwtStartLock = new ReentrantLock();
private final Condition bwtStartCondition = bwtStartLock.newCondition();
private Throwable bwtStartException;
private boolean shutdown;
public ConnectionService() {
this(true);
@@ -1195,7 +1196,7 @@ public class ElectrumServer {
}
public boolean isConnecting() {
return isRunning() && Config.get().getServerType() == ServerType.BITCOIN_CORE && bwt.isRunning() && !bwt.isReady();
return isRunning() && firstCall && (Config.get().getServerType() != ServerType.BITCOIN_CORE || (bwt.isRunning() && !bwt.isReady()));
}
public boolean isConnectionRunning() {
@@ -1203,7 +1204,11 @@ public class ElectrumServer {
}
public boolean isConnected() {
return isRunning() && (Config.get().getServerType() != ServerType.BITCOIN_CORE || (bwt.isRunning() && bwt.isReady()));
return isRunning() && !firstCall && (Config.get().getServerType() != ServerType.BITCOIN_CORE || (bwt.isRunning() && bwt.isReady()));
}
public boolean isShutdown() {
return shutdown;
}
@Override
@@ -1219,6 +1224,11 @@ public class ElectrumServer {
}
private void shutdown() {
shutdown = true;
if(reader != null && reader.isAlive()) {
reader.interrupt();
}
if(Config.get().getServerType() == ServerType.BITCOIN_CORE && bwt.isRunning()) {
Bwt.DisconnectionService disconnectionService = bwt.getDisconnectionService();
disconnectionService.setOnSucceeded(workerStateEvent -> {