diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-11-27 13:34:08 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-11-27 13:45:14 +0100 |
| commit | 2a94cd67e80555aec3ba13d5129b1f5402b0c5b4 (patch) | |
| tree | e215dd05d37b8c17f1fe3e5d4ff5841a74620481 /src/bitcoind.cpp | |
| parent | Merge pull request #7053 (diff) | |
| parent | Initialize logging before we do parameter interaction (diff) | |
| download | discoin-2a94cd67e80555aec3ba13d5129b1f5402b0c5b4.tar.xz discoin-2a94cd67e80555aec3ba13d5129b1f5402b0c5b4.zip | |
Merge pull request #6780
a46f87f Initialize logging before we do parameter interaction (Jonas Schnelli)
df66147 Move -blocksonly parameter interaction to the new ParameterInteraction() function (Jonas Schnelli)
68354e7 [QT] Call inits parameter interaction before we create the options model (Jonas Schnelli)
411b05a Refactor parameter interaction, call it before AppInit2() (Jonas Schnelli)
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index addf0e6a2..4cee2d3cf 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -151,6 +151,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) { |