Move RPC registration out of AppInitParameterInteraction
Move to AppInitServers. This doesn't have any effects on bitcoin behavior. It was just strange to have this unrelated code in the middle or parameter interaction.
This commit is contained in:
parent
2f959a5874
commit
abbd230217
1 changed files with 8 additions and 5 deletions
13
src/init.cpp
13
src/init.cpp
|
@ -1033,11 +1033,6 @@ bool AppInitParameterInteraction()
|
||||||
fPruneMode = true;
|
fPruneMode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
RegisterAllCoreRPCCommands(tableRPC);
|
|
||||||
#ifdef ENABLE_WALLET
|
|
||||||
RegisterWalletRPC(tableRPC);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
nConnectTimeout = gArgs.GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
|
nConnectTimeout = gArgs.GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
|
||||||
if (nConnectTimeout <= 0)
|
if (nConnectTimeout <= 0)
|
||||||
nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
|
nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
|
||||||
|
@ -1241,6 +1236,14 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
|
|
||||||
GetMainSignals().RegisterBackgroundSignalScheduler(scheduler);
|
GetMainSignals().RegisterBackgroundSignalScheduler(scheduler);
|
||||||
|
|
||||||
|
/* Register RPC commands regardless of -server setting so they will be
|
||||||
|
* available in the GUI RPC console even if external calls are disabled.
|
||||||
|
*/
|
||||||
|
RegisterAllCoreRPCCommands(tableRPC);
|
||||||
|
#ifdef ENABLE_WALLET
|
||||||
|
RegisterWalletRPC(tableRPC);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Start the RPC server already. It will be started in "warmup" mode
|
/* Start the RPC server already. It will be started in "warmup" mode
|
||||||
* and not really process calls already (but it will signify connections
|
* and not really process calls already (but it will signify connections
|
||||||
* that the server is there and will be ready later). Warmup mode will
|
* that the server is there and will be ready later). Warmup mode will
|
||||||
|
|
Loading…
Reference in a new issue