aboutsummaryrefslogtreecommitdiff
path: root/src/bitcoind.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2018-05-09 06:31:11 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2018-05-09 06:36:54 +0200
commit7b966d9e6e30f39731ef511cfa3255652543b55d (patch)
tree6a586fa13c4e10f06628f232f012b03eaabd6a03 /src/bitcoind.cpp
parent6b824c090f53d0a56833930fd38c41bcaec8ff4a (diff)
parent25b7ab9c02f691be6c1aa71a9cf51ac1a6ea9db4 (diff)
Merge #10267: New -includeconf argument for including external configuration files
25b7ab9 doc: Add release notes for -includeconf (Karl-Johan Alm) 0f0badd test: Test includeconf parameter. (Karl-Johan Alm) 629ff8c -includeconf=<path> support in config handler, for including external configuration files (Karl-Johan Alm) Pull request description: Fixes: #10071. Done: - adds `-includeconf=<path>`, where `<path>` is relative to `datadir` or to the path of the file being read, if in a file - protects against circular includes - updates help docs ~~~Thoughts:~~~ - ~~~I am not sure how to test this in a neat manner. Feedback on this would be nice. Will dig/think though.~~~ Tree-SHA512: cb31f1b2f69fbc0890d264948eb2e501ac05cf12f5e06a5942f9c1539eb15ea8dc3cae817f4073aecb2fcc21d0386747f14f89d990772003a76e2a6d25642553
Diffstat (limited to 'src/bitcoind.cpp')
-rw-r--r--src/bitcoind.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 69de1a1666..32b67cabb9 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -92,7 +92,7 @@ static bool AppInit(int argc, char* argv[])
}
try
{
- gArgs.ReadConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME));
+ gArgs.ReadConfigFiles();
} catch (const std::exception& e) {
fprintf(stderr,"Error reading configuration file: %s\n", e.what());
return false;