Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 19:56:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

shutting down TorNetworkNode invokes callback handler if already complete

Browse source
This commit is contained in:
woodser 2023-07-26 09:26:06 -04:00
parent c39c5cf387
commit c548fdaf29
6 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
p2p/src/main/java/haveno/network/p2p/network/TorNetworkNode.java
View file

@ -58,6 +58,7 @@ public class TorNetworkNode extends NetworkNode {
private boolean streamIsolation;
private Socks5Proxy socksProxy;
private boolean shutDownInProgress;
private boolean shutDownComplete;
private final ExecutorService executor;
///////////////////////////////////////////////////////////////////////////////////////////
@ -121,17 +122,21 @@ public class TorNetworkNode extends NetworkNode {
public void shutDown(@Nullable Runnable shutDownCompleteHandler) {
log.info("TorNetworkNode shutdown started");
if (shutDownComplete) {
log.info("TorNetworkNode shutdown already completed");
if (shutDownCompleteHandler != null) shutDownCompleteHandler.run();
return;
}
if (shutDownInProgress) {
log.warn("We got shutDown already called");
log.warn("Ignoring request to shut down because shut down is in progress");
return;
}
shutDownInProgress = true;
shutDownTimeoutTimer = UserThread.runAfter(() -> {
log.error("A timeout occurred at shutDown");
if (shutDownCompleteHandler != null)
shutDownCompleteHandler.run();
shutDownComplete = true;
if (shutDownCompleteHandler != null) shutDownCompleteHandler.run();
executor.shutdownNow();
}, SHUT_DOWN_TIMEOUT);
@ -148,8 +153,8 @@ public class TorNetworkNode extends NetworkNode {
log.error("Shutdown torNetworkNode failed with exception", e);
} finally {
shutDownTimeoutTimer.stop();
if (shutDownCompleteHandler != null)
shutDownCompleteHandler.run();
shutDownComplete = true;
if (shutDownCompleteHandler != null) shutDownCompleteHandler.run();
}
});
}