DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Allow hush-cli stop to be run during RPC warmup, thanks to @zancas for the idea

Browse Source
This commit is contained in:
Duke Leto
2019-12-16 08:45:18 -05:00
parent 9f5b003a40
commit 1e980895b8
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/rpc/server.cpp
View File

@@ -858,20 +858,25 @@ std::string JSONRPCExecBatch(const UniValue& vReq)
UniValue CRPCTable::execute(const std::string &strMethod, const UniValue &params) const
{
// Return immediately if in warmup
{
LOCK(cs_rpcWarmup);
if (fRPCInWarmup)
throw JSONRPCError(RPC_IN_WARMUP, rpcWarmupStatus);
}
//printf("RPC call: %s\n", strMethod.c_str());
// Find method
const CRPCCommand *pcmd = tableRPC[strMethod];
if (!pcmd)
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Method not found");
// Return immediately if in warmup
{
LOCK(cs_rpcWarmup);
if (fRPCInWarmup) {
// hush-cli stop is the only valid RPC command during warmup
// We don't know if we have valid blocks or wallet yet, nothing else is safe
if (pcmd->name != "stop") {
throw JSONRPCError(RPC_IN_WARMUP, rpcWarmupStatus);
}
}
}
//printf("RPC call: %s\n", strMethod.c_str());
g_rpcSignals.PreCommand(*pcmd);
try