append tor debug output to test results

This commit is contained in:
Craig Raw 2021-03-08 09:35:21 +02:00
parent 68344e981c
commit 32ab53ba03

View file

@ -414,17 +414,15 @@ public class ServerPreferencesController extends PreferencesDetailController {
torService.setPeriod(Duration.hours(1000)); torService.setPeriod(Duration.hours(1000));
torService.setRestartOnFailure(false); torService.setRestartOnFailure(false);
torService.setOnRunning(workerStateEvent -> {
testResults.setText(testResults.getText() + "\nStarting Tor...");
});
torService.setOnSucceeded(workerStateEvent -> { torService.setOnSucceeded(workerStateEvent -> {
Tor.setDefault(torService.getValue()); Tor.setDefault(torService.getValue());
torService.cancel(); torService.cancel();
testResults.setText(testResults.getText() + "\nTor started"); testResults.appendText("\nTor running, connecting to " + Config.get().getServerAddress() + "...");
startElectrumConnection(); startElectrumConnection();
}); });
torService.setOnFailed(workerStateEvent -> { torService.setOnFailed(workerStateEvent -> {
testResults.setText(testResults.getText() + "\nTor failed to start"); torService.cancel();
testResults.appendText("\nTor failed to start");
showConnectionFailure(workerStateEvent.getSource().getException()); showConnectionFailure(workerStateEvent.getSource().getException());
}); });
@ -766,4 +764,13 @@ public class ServerPreferencesController extends PreferencesDetailController {
connectionService.cancel(); connectionService.cancel();
} }
} }
@Subscribe
public void torStatus(TorStatusEvent event) {
Platform.runLater(() -> {
if(torService != null && torService.isRunning()) {
testResults.appendText("\n" + event.getStatus());
}
});
}
} }