diff options
| author | Daniel Cousens <github@dcousens.com> | 2015-11-19 12:34:19 +1100 |
|---|---|---|
| committer | Daniel Cousens <github@dcousens.com> | 2015-11-19 12:34:19 +1100 |
| commit | cdcd816a1b55578ae8f89bbd5ecbc453973b710f (patch) | |
| tree | bd5a142accb238e576b2580ff154881f1ca53f92 /src/init.cpp | |
| parent | 7f8e90da335e851b8ec11e994a7da729ac73ef68 (diff) | |
| download | bitcoin-cdcd816a1b55578ae8f89bbd5ecbc453973b710f.tar.xz | |
init: amend ZMQ flag names
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index cd84e7747a..d1a98023ff 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -409,9 +409,9 @@ std::string HelpMessage(HelpMessageMode mode) #if ENABLE_ZMQ strUsage += HelpMessageGroup(_("ZeroMQ notification options:")); strUsage += HelpMessageOpt("-zmqpubhashblock=<address>", _("Enable publish hash block in <address>")); - strUsage += HelpMessageOpt("-zmqpubhashtransaction=<address>", _("Enable publish hash transaction in <address>")); + strUsage += HelpMessageOpt("-zmqpubhashtx=<address>", _("Enable publish hash transaction in <address>")); strUsage += HelpMessageOpt("-zmqpubrawblock=<address>", _("Enable publish raw block in <address>")); - strUsage += HelpMessageOpt("-zmqpubrawtransaction=<address>", _("Enable publish raw transaction in <address>")); + strUsage += HelpMessageOpt("-zmqpubrawtx=<address>", _("Enable publish raw transaction in <address>")); #endif strUsage += HelpMessageGroup(_("Debugging/Testing options:")); @@ -830,7 +830,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__); #endif } - + // Make sure enough file descriptors are available int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1); int nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS); |