diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-10-03 13:16:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-10-03 15:25:09 +0200 |
| commit | a7e5cbb209d4aeb8c2e4c58c92bf214759998056 (patch) | |
| tree | 4f0885ed50a46481db455943f5ea6bdb332a61ec /src/bitcoin-cli.cpp | |
| parent | Merge #8860: [qa] util: Move wait_bitcoinds() into stop_nodes() (diff) | |
| parent | Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (diff) | |
| download | discoin-a7e5cbb209d4aeb8c2e4c58c92bf214759998056.tar.xz discoin-a7e5cbb209d4aeb8c2e4c58c92bf214759998056.zip | |
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/bitcoin-cli.cpp')
| -rw-r--r-- | src/bitcoin-cli.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 68f5d90f5..9d4c4e53b 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -92,7 +92,7 @@ static bool AppInitRPC(int argc, char* argv[]) return false; } try { - ReadConfigFile(mapArgs, mapMultiArgs); + ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs); } catch (const std::exception& e) { fprintf(stderr,"Error reading configuration file: %s\n", e.what()); return false; @@ -209,7 +209,7 @@ UniValue CallRPC(const string& strMethod, const UniValue& params) if (!GetAuthCookie(&strRPCUserColonPass)) { throw runtime_error(strprintf( _("Could not locate RPC credentials. No authentication cookie could be found, and no rpcpassword is set in the configuration file (%s)"), - GetConfigFile().string().c_str())); + GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string().c_str())); } } else { |