diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-03 13:16:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-03 15:25:09 +0200 |
| commit | a7e5cbb209d4aeb8c2e4c58c92bf214759998056 (patch) | |
| tree | 4f0885ed50a46481db455943f5ea6bdb332a61ec /src/init.cpp | |
| parent | 76f3c02fb01a6df98fbd8c16ac21d159d4649d37 (diff) | |
| parent | 3450c18a125f125aec76bfef79c69317eaad935d (diff) | |
| download | bitcoin-a7e5cbb209d4aeb8c2e4c58c92bf214759998056.tar.xz | |
Merge #8856: Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
3450c18 Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (Jorge Timón)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index cf92347952..eefef7ba0b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1064,7 +1064,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime())); LogPrintf("Default data directory %s\n", GetDefaultDataDir().string()); LogPrintf("Using data directory %s\n", strDataDir); - LogPrintf("Using config file %s\n", GetConfigFile().string()); + LogPrintf("Using config file %s\n", GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string()); LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD); LogPrintf("Using %u threads for script verification\n", nScriptCheckThreads); |