Commit 347f2598 authored by zeroleak's avatar zeroleak
Browse files

cleanup

parent c8beaed0
......@@ -67,7 +67,7 @@ public class TorOnionProxyInstance implements JavaTorConnexion {
Application.exitError(1);
}
},
"start-TorOnionProxyInstance");
"TorOnionProxyInstance-start");
startThread.setDaemon(true);
startThread.start();
}
......@@ -142,7 +142,7 @@ public class TorOnionProxyInstance implements JavaTorConnexion {
() -> {
stop();
},
"stop-torOnionProxyInstance");
"TorOnionProxyInstance-stop");
stopThread.setDaemon(true);
stopThread.start();
/*try {
......@@ -155,7 +155,22 @@ public class TorOnionProxyInstance implements JavaTorConnexion {
public void changeIdentity() {
progress = PROGRESS_CONNECTING;
if (!onionProxyManager.setNewIdentity()) {
boolean success = onionProxyManager.setNewIdentity();
if (success) {
// watch tor progress in a new thread
Thread statusThread =
new Thread(
() -> {
try {
waitReady(); // updates progress
} catch (Exception e) {
log.error("", e);
}
},
"TorOnionProxyInstance-status");
statusThread.setDaemon(true);
statusThread.start();
} else {
log.warn("changeIdentity failed, restarting Tor...");
stop();
start();
......
......@@ -218,8 +218,8 @@ public class CliService {
log.info(CliUtils.LOG_SEPARATOR);
log.info("⣿ AUTHENTICATION REQUIRED");
log.info("⣿ Whirlpool wallet is CLOSED.");
log.info("⣿ • Type your seed passphrase to authenticate and start mixing.");
return CliUtils.readUserInputRequired("Seed passphrase?", true);
log.info("⣿ • Type your passphrase to authenticate and start mixing.");
return CliUtils.readUserInputRequired("Passphrase?", true);
}
public void shutdown() {
......
......@@ -107,7 +107,7 @@ public class CliWalletService extends WhirlpoolWalletService {
// identifier
walletIdentifier = computeWalletIdentifier(seed, passphrase, params);
} catch (MnemonicException e) {
throw new NotifiableException("Mnemonic failed, invalid passphrase?");
throw new NotifiableException("Mnemonic failed: invalid passphrase?");
}
// debug cliConfig
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment