sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix isconnecting state change

Browse source
This commit is contained in:
Craig Raw 2022-11-17 08:08:50 +02:00
parent fb25edb51c
commit e39a2cb944
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/AppServices.java
View file

@ -284,7 +284,7 @@ public class AppServices {
});
connectionService.setOnFailed(failEvent -> {
//Close connection here to create a new transport next time we try
connectionService.resetConnection();
connectionService.closeConnection();
if(failEvent.getSource().getException() instanceof ServerConfigException) {
connectionService.setRestartOnFailure(false);

9
src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
View file

@ -1176,7 +1176,7 @@ public class ElectrumServer {
return new FeeRatesUpdatedEvent(blockTargetFeeRates, mempoolRateSizes);
}
} else {
resetConnection();
closeConnection();
}
}
@ -1185,18 +1185,18 @@ public class ElectrumServer {
};
}
public void resetConnection() {
public void closeConnection() {
try {
closeActiveConnection();
shutdown();
firstCall = true;
} catch (ServerException e) {
log.error("Error closing connection during connection reset", e);
log.error("Error closing connection", e);
}
}
public boolean isConnecting() {
return isRunning() && firstCall && (Config.get().getServerType() != ServerType.BITCOIN_CORE || (bwt.isRunning() && !bwt.isReady()));
return isRunning() && firstCall && !shutdown && (Config.get().getServerType() != ServerType.BITCOIN_CORE || (bwt.isRunning() && !bwt.isReady()));
}
public boolean isConnectionRunning() {
@ -1250,6 +1250,7 @@ public class ElectrumServer {
public void reset() {
super.reset();
firstCall = true;
shutdown = false;
}
@Override