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

Remove restartTor method as restart is not supported anymore.

Browse Source 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-12-13 18:15:23 -05:00
parent c000d38a09
commit ebb6652cef
No known key found for this signature in database
GPG Key ID: 02AA2BAE387C8307
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
View File

@ -49,12 +49,10 @@ import static com.google.common.base.Preconditions.checkArgument;
@Slf4j @Slf4j
public class TorNetworkNode extends NetworkNode { public class TorNetworkNode extends NetworkNode {
private static final int MAX_RESTART_ATTEMPTS = 5;
private static final long SHUT_DOWN_TIMEOUT = 2; private static final long SHUT_DOWN_TIMEOUT = 2;
private HiddenServiceSocket hiddenServiceSocket; private HiddenServiceSocket hiddenServiceSocket;
private Timer shutDownTimeoutTimer; private Timer shutDownTimeoutTimer;
private int restartCounter;
private Tor tor; private Tor tor;
private TorMode torMode; private TorMode torMode;
private boolean streamIsolation; private boolean streamIsolation;
@ -160,30 +158,7 @@ public class TorNetworkNode extends NetworkNode {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// shutdown, restart // Create tor and hidden service
///////////////////////////////////////////////////////////////////////////////////////////
private void restartTor(String errorMessage) {
log.info("Restarting Tor");
restartCounter++;
if (restartCounter <= MAX_RESTART_ATTEMPTS) {
UserThread.execute(() -> {
setupListeners.forEach(SetupListener::onRequestCustomBridges);
});
log.warn("We stop tor as starting tor with the default bridges failed. We request user to add custom bridges.");
shutDown(null);
} else {
String msg = "We tried to restart Tor " + restartCounter +
" times, but it continued to fail with error message:\n" +
errorMessage + "\n\n" +
"Please check your internet connection and firewall and try to start again.";
log.error(msg);
throw new RuntimeException(msg);
}
}
///////////////////////////////////////////////////////////////////////////////////////////
// create tor
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private void createTorAndHiddenService(int localPort, int servicePort) { private void createTorAndHiddenService(int localPort, int servicePort) {
@ -199,7 +174,6 @@ public class TorNetworkNode extends NetworkNode {
"Tor hidden service published after {} ms. Socket={}\n" + "Tor hidden service published after {} ms. Socket={}\n" +
"################################################################", "################################################################",
System.currentTimeMillis() - ts, socket); System.currentTimeMillis() - ts, socket);
UserThread.execute(() -> { UserThread.execute(() -> {
nodeAddressProperty.set(new NodeAddress(hiddenServiceSocket.getServiceName() + ":" + hiddenServiceSocket.getHiddenServicePort())); nodeAddressProperty.set(new NodeAddress(hiddenServiceSocket.getServiceName() + ":" + hiddenServiceSocket.getHiddenServicePort()));
startServer(socket); startServer(socket);
@ -208,15 +182,16 @@ public class TorNetworkNode extends NetworkNode {
return null; return null;
}); });
} catch (TorCtlException e) { } catch (TorCtlException e) {
String msg = e.getCause() != null ? e.getCause().toString() : e.toString();
log.error("Starting tor node failed", e); log.error("Starting tor node failed", e);
if (e.getCause() instanceof IOException) { if (e.getCause() instanceof IOException) {
UserThread.execute(() -> setupListeners.forEach(s -> s.onSetupFailed(new RuntimeException(msg)))); UserThread.execute(() -> setupListeners.forEach(s -> s.onSetupFailed(new RuntimeException(e.getMessage()))));
} else { } else {
restartTor(e.getMessage()); UserThread.execute(() -> setupListeners.forEach(SetupListener::onRequestCustomBridges));
log.warn("We shutdown as starting tor with the default bridges failed. We request user to add custom bridges.");
shutDown(null);
} }
} catch (IOException e) { } catch (IOException e) {
log.error("Could not connect to running Tor: {}", e.getMessage()); log.error("Could not connect to running Tor", e);
UserThread.execute(() -> setupListeners.forEach(s -> s.onSetupFailed(new RuntimeException(e.getMessage())))); UserThread.execute(() -> setupListeners.forEach(s -> s.onSetupFailed(new RuntimeException(e.getMessage()))));
} catch (Throwable ignore) { } catch (Throwable ignore) {
} }