{
fShutdown = true;
nTransactionsUpdated++;
- DBFlush(false, false);
+ DBFlush(false);
StopNode();
- DBFlush(true, true);
+ DBFlush(true);
boost::filesystem::remove(GetPidFile());
UnregisterWallet(pwalletMain);
delete pwalletMain;
string strUsage = string() +
_("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
- " bitcoin [options] \t " + "\n" +
- " bitcoin [options] <command> [params]\t " + _("Send command to -server or bitcoind\n") +
- " bitcoin [options] help \t\t " + _("List commands\n") +
- " bitcoin [options] help <command> \t\t " + _("Get help for a command\n") +
- _("Options:\n") +
- " -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") +
- " -pid=<file> \t\t " + _("Specify pid file (default: bitcoind.pid)\n") +
- " -gen \t\t " + _("Generate coins\n") +
- " -gen=0 \t\t " + _("Don't generate coins\n") +
- " -min \t\t " + _("Start minimized\n") +
- " -datadir=<dir> \t\t " + _("Specify data directory\n") +
- " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)\n") +
- " -proxy=<ip:port> \t " + _("Connect through socks4 proxy\n") +
- " -dns \t " + _("Allow DNS lookups for addnode and connect\n") +
- " -addnode=<ip> \t " + _("Add a node to connect to\n") +
- " -connect=<ip> \t\t " + _("Connect only to the specified node\n") +
- " -nolisten \t " + _("Don't accept connections from outside\n") +
- " -banscore=<n> \t " + _("Threshold for disconnecting misbehaving peers (default: 100)\n") +
- " -bantime=<n> \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)\n") +
+ " bitcoind [options] \t " + "\n" +
+ " bitcoind [options] <command> [params]\t " + _("Send command to -server or bitcoind") + "\n" +
+ " bitcoind [options] help \t\t " + _("List commands") + "\n" +
+ " bitcoind [options] help <command> \t\t " + _("Get help for a command") + "\n" +
+ _("Options:") + "\n" +
+ " -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)") + "\n" +
+ " -pid=<file> \t\t " + _("Specify pid file (default: bitcoind.pid)") + "\n" +
+ " -gen \t\t " + _("Generate coins") + "\n" +
+ " -gen=0 \t\t " + _("Don't generate coins") + "\n" +
+ " -min \t\t " + _("Start minimized") + "\n" +
+ " -datadir=<dir> \t\t " + _("Specify data directory") + "\n" +
+ " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)") + "\n" +
+ " -proxy=<ip:port> \t " + _("Connect through socks4 proxy") + "\n" +
+ " -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" +
+ " -port=<port> \t\t " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n" +
+ " -maxconnections=<n>\t " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" +
+ " -addnode=<ip> \t " + _("Add a node to connect to") + "\n" +
+ " -connect=<ip> \t\t " + _("Connect only to the specified node") + "\n" +
+ " -nolisten \t " + _("Don't accept connections from outside") + "\n" +
+ " -nodnsseed \t " + _("Don't bootstrap list of peers using DNS") + "\n" +
+ " -banscore=<n> \t " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" +
+ " -bantime=<n> \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
+ " -maxreceivebuffer=<n>\t " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)") + "\n" +
+ " -maxsendbuffer=<n>\t " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)") + "\n" +
#ifdef USE_UPNP
#if USE_UPNP
- " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port\n") +
+ " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port") + "\n" +
#else
- " -upnp \t " + _("Attempt to use UPnP to map the listening port\n") +
+ " -upnp \t " + _("Attempt to use UPnP to map the listening port") + "\n" +
#endif
#endif
- " -paytxfee=<amt> \t " + _("Fee per KB to add to transactions you send\n") +
+ " -paytxfee=<amt> \t " + _("Fee per KB to add to transactions you send") + "\n" +
#ifdef GUI
- " -server \t\t " + _("Accept command line and JSON-RPC commands\n") +
+ " -server \t\t " + _("Accept command line and JSON-RPC commands") + "\n" +
#endif
#ifndef WIN32
- " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") +
+ " -daemon \t\t " + _("Run in the background as a daemon and accept commands") + "\n" +
#endif
- " -testnet \t\t " + _("Use the test network\n") +
- " -rpcuser=<user> \t " + _("Username for JSON-RPC connections\n") +
- " -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections\n") +
- " -rpcport=<port> \t\t " + _("Listen for JSON-RPC connections on <port> (default: 8332)\n") +
- " -rpcallowip=<ip> \t\t " + _("Allow JSON-RPC connections from specified IP address\n") +
- " -rpcconnect=<ip> \t " + _("Send commands to node running on <ip> (default: 127.0.0.1)\n") +
- " -keypool=<n> \t " + _("Set key pool size to <n> (default: 100)\n") +
- " -rescan \t " + _("Rescan the block chain for missing wallet transactions\n");
+ " -testnet \t\t " + _("Use the test network") + "\n" +
+ " -debug \t\t " + _("Output extra debugging information") + "\n" +
+ " -logtimestamps \t " + _("Prepend debug output with timestamp") + "\n" +
+ " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file") + "\n" +
+#ifdef WIN32
+ " -printtodebugger \t " + _("Send trace/debug info to debugger") + "\n" +
+#endif
+ " -rpcuser=<user> \t " + _("Username for JSON-RPC connections") + "\n" +
+ " -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections") + "\n" +
+ " -rpcport=<port> \t\t " + _("Listen for JSON-RPC connections on <port> (default: 8332)") + "\n" +
+ " -rpcallowip=<ip> \t\t " + _("Allow JSON-RPC connections from specified IP address") + "\n" +
+ " -rpcconnect=<ip> \t " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" +
+ " -keypool=<n> \t " + _("Set key pool size to <n> (default: 100)") + "\n" +
+ " -rescan \t " + _("Rescan the block chain for missing wallet transactions") + "\n";
#ifdef USE_SSL
strUsage += string() +
- _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") +
- " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") +
- " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)\n") +
- " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)\n") +
- " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n");
+ _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" +
+ " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" +
+ " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)") + "\n" +
+ " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)") + "\n" +
+ " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n";
#endif
strUsage += string() +
- " -? \t\t " + _("This help message\n");
+ " -? \t\t " + _("This help message") + "\n";
// Remove tabs
strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end());
}
// Bind to the port early so we can tell if another instance is already running.
- string strErrors;
if (!fNoListen)
{
- if (!BindListenPort(strErrors))
+ std::string strError;
+ if (!BindListenPort(strError))
{
- wxMessageBox(strErrors, "Bitcoin");
+ wxMessageBox(strError, "Bitcoin");
return false;
}
}
+ std::ostringstream strErrors;
//
// Load data files
//
if (fDaemon)
fprintf(stdout, "bitcoin server starting\n");
- strErrors = "";
int64 nStart;
InitMessage(_("Loading addresses..."));
printf("Loading addresses...\n");
nStart = GetTimeMillis();
if (!LoadAddresses())
- strErrors += _("Error loading addr.dat \n");
+ strErrors << _("Error loading addr.dat") << "\n";
printf(" addresses %15"PRI64d"ms\n", GetTimeMillis() - nStart);
InitMessage(_("Loading block index..."));
printf("Loading block index...\n");
nStart = GetTimeMillis();
if (!LoadBlockIndex())
- strErrors += _("Error loading blkindex.dat \n");
+ strErrors << _("Error loading blkindex.dat") << "\n";
printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart);
InitMessage(_("Loading wallet..."));
if (nLoadWalletRet != DB_LOAD_OK)
{
if (nLoadWalletRet == DB_CORRUPT)
- strErrors += _("Error loading wallet.dat: Wallet corrupted \n");
+ strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n";
else if (nLoadWalletRet == DB_TOO_NEW)
- strErrors += _("Error loading wallet.dat: Wallet requires newer version of Bitcoin \n");
+ strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin") << "\n";
else if (nLoadWalletRet == DB_NEED_REWRITE)
{
- strErrors += _("Wallet needed to be rewritten: restart Bitcoin to complete \n");
- wxMessageBox(strErrors, "Bitcoin", wxOK | wxICON_ERROR);
+ strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n";
+ wxMessageBox(strErrors.str(), "Bitcoin", wxOK | wxICON_ERROR);
return false;
}
else
- strErrors += _("Error loading wallet.dat \n");
+ strErrors << _("Error loading wallet.dat") << "\n";
}
printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart);
InitMessage(_("Done loading"));
printf("Done loading\n");
- //// debug print
- printf("mapBlockIndex.size() = %d\n", mapBlockIndex.size());
- printf("nBestHeight = %d\n", nBestHeight);
- printf("setKeyPool.size() = %d\n", pwalletMain->setKeyPool.size());
- printf("mapWallet.size() = %d\n", pwalletMain->mapWallet.size());
- printf("mapAddressBook.size() = %d\n", pwalletMain->mapAddressBook.size());
+ //// debug print
+ printf("mapBlockIndex.size() = %d\n", mapBlockIndex.size());
+ printf("nBestHeight = %d\n", nBestHeight);
+ printf("setKeyPool.size() = %d\n", pwalletMain->setKeyPool.size());
+ printf("mapWallet.size() = %d\n", pwalletMain->mapWallet.size());
+ printf("mapAddressBook.size() = %d\n", pwalletMain->mapAddressBook.size());
- if (!strErrors.empty())
+ if (!strErrors.str().empty())
{
- wxMessageBox(strErrors, "Bitcoin", wxOK | wxICON_ERROR);
+ wxMessageBox(strErrors.str(), "Bitcoin", wxOK | wxICON_ERROR);
return false;
}
}
}
- if (GetBoolArg("-nodnsseed"))
- printf("DNS seeding disabled\n");
- else
- DNSAddressSeed();
-
if (mapArgs.count("-paytxfee"))
{
if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))
git://git.novaco.in / novacoin.git / blobdiff