diff options
| author | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
| commit | a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc (patch) | |
| tree | 7e3932c75353499d6659b4f5a94b40e07e64c364 /src/bitcoind.cpp | |
| parent | When/if the copyright line does not mention Bitcoin Core developers, add a se... (diff) | |
| parent | Merge #7091: Consensus build package (diff) | |
| download | discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.tar.xz discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.zip | |
Merge branch 'master' into single_prodname
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 9ad5a4786..28bc374ac 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2013 The Bitcoin Core developers +// Copyright (c) 2009-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -9,14 +9,13 @@ #include "chainparams.h" #include "clientversion.h" -#include "rpcserver.h" +#include "rpc/server.h" #include "init.h" #include "noui.h" #include "scheduler.h" #include "util.h" #include "httpserver.h" #include "httprpc.h" -#include "rpcserver.h" #include "utilstrencodings.h" #include <boost/algorithm/string/predicate.hpp> @@ -156,6 +155,9 @@ bool AppInit(int argc, char* argv[]) #endif SoftSetBoolArg("-server", true); + // Set this early so that parameter interactions go to console + InitLogging(); + InitParameterInteraction(); fRet = AppInit2(threadGroup, scheduler); } catch (const std::exception& e) { |