Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 15:22:16 +00:00
Code Issues Projects Releases Wiki Activity

WalletTool: allow control of logging from the command line. Change how block chain download is waited for.

Browse Source
This commit is contained in:
Mike Hearn 2012-02-12 22:14:01 +01:00
parent 11dcb0a682
commit cfd06195a0
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/google/bitcoin/tools/WalletTool.java
View File

@ -20,6 +20,7 @@ import com.google.bitcoin.core.*;
import com.google.bitcoin.discovery.DnsDiscovery; import com.google.bitcoin.discovery.DnsDiscovery;
import com.google.bitcoin.store.BlockStoreException; import com.google.bitcoin.store.BlockStoreException;
import com.google.bitcoin.store.BoundedOverheadBlockStore; import com.google.bitcoin.store.BoundedOverheadBlockStore;
import com.google.bitcoin.utils.BriefLogFormatter;
import joptsimple.OptionParser; import joptsimple.OptionParser;
import joptsimple.OptionSet; import joptsimple.OptionSet;
import joptsimple.OptionSpec; import joptsimple.OptionSpec;
@ -84,12 +85,10 @@ public class WalletTool {
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// Disable logspam.
LogManager.getLogManager().getLogger("").setLevel(Level.SEVERE);
OptionParser parser = new OptionParser(); OptionParser parser = new OptionParser();
parser.accepts("help"); parser.accepts("help");
parser.accepts("force"); parser.accepts("force");
parser.accepts("debuglog");
walletFileName = parser.accepts("wallet") walletFileName = parser.accepts("wallet")
.withRequiredArg() .withRequiredArg()
.defaultsTo("wallet"); .defaultsTo("wallet");
@ -117,6 +116,13 @@ public class WalletTool {
return; return;
} }
if (options.has("debuglog")) {
BriefLogFormatter.init();
} else {
// Disable logspam unless there is a flag.
LogManager.getLogManager().getLogger("").setLevel(Level.SEVERE);
}
File chainFileName; File chainFileName;
switch (netFlag.value(options)) { switch (netFlag.value(options)) {
case PROD: case PROD:
@ -187,17 +193,19 @@ public class WalletTool {
final int startTransactions = wallet.getTransactions(true, true).size(); final int startTransactions = wallet.getTransactions(true, true).size();
peers.start(); peers.start();
peers.startBlockChainDownload(new DownloadListener() { DownloadListener listener = new DownloadListener();
@Override peers.startBlockChainDownload(listener);
protected void doneDownload() { try {
super.doneDownload(); listener.await();
} catch (InterruptedException e) {
System.err.println("Chain download interrupted, quitting ...");
System.exit(1);
}
peers.stop(); peers.stop();
int endTransactions = wallet.getTransactions(true, true).size(); int endTransactions = wallet.getTransactions(true, true).size();
if (endTransactions > startTransactions) { if (endTransactions > startTransactions) {
System.out.println("Synced " + (endTransactions - startTransactions) + " transactions."); System.out.println("Synced " + (endTransactions - startTransactions) + " transactions.");
} }
}
});
} catch (BlockStoreException e) { } catch (BlockStoreException e) {
System.err.println("Error reading block chain file " + chainFileName + ": " + e.getMessage()); System.err.println("Error reading block chain file " + chainFileName + ": " + e.getMessage());
e.printStackTrace(); e.printStackTrace();