diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-20 11:48:22 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-20 16:07:33 +0100 |
| commit | 8b9adca4461d0cb6bdfca7b74228d430b9b9d116 (patch) | |
| tree | 8c808c370f97b626bc9318a7ece95de2a6525435 /src/init.cpp | |
| parent | 9e508b55885ba747dce2e3fd5ef4c05572cda0b0 (diff) | |
| download | bitcoin-8b9adca4461d0cb6bdfca7b74228d430b9b9d116.tar.xz | |
Allow `-noserver` with bitcoind
Allow running bitcoind without server.
- Default to -server mode (of course) for bitcoind with SoftSetBoolArg
- Remove fForceServer argument from AppInit2
- Move fDaemon to a static variable in bitcoind
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/init.cpp b/src/init.cpp index b5d784dc58..275985604e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -242,10 +242,7 @@ std::string HelpMessage(HelpMessageMode hmm) strUsage += " -printtoconsole " + _("Send trace/debug info to console instead of debug.log file") + "\n"; strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be solved instantly.") + "\n"; strUsage += " " + _("This is intended for regression testing tools and app development.") + "\n"; - if (hmm == HMM_BITCOIN_QT) - { - strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n"; - } + strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n"; if (hmm == HMM_BITCOIND) { @@ -356,7 +353,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) /** Initialize bitcoin. * @pre Parameters should be parsed and config file should be read. */ -bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) +bool AppInit2(boost::thread_group& threadGroup) { // ********************************************************* Step 1: setup #ifdef _MSC_VER @@ -483,11 +480,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS) nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS; - if (fDaemon || fForceServer) - fServer = true; - else - fServer = GetBoolArg("-server", false); - + fServer = GetBoolArg("-server", false); fPrintToConsole = GetBoolArg("-printtoconsole", false); fLogTimestamps = GetBoolArg("-logtimestamps", true); #ifdef ENABLE_WALLET @@ -569,9 +562,6 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD); std::ostringstream strErrors; - if (fDaemon) - fprintf(stdout, "Bitcoin server starting\n"); - if (nScriptCheckThreads) { LogPrintf("Using %u threads for script verification\n", nScriptCheckThreads); for (int i=0; i<nScriptCheckThreads-1; i++) |