GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 834ac4c0f5 into merged_master (Bitcoin PR #19323)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 03:36:32 +00:00
commit 0fb616ece5
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/init.cpp
View file

@ -823,13 +823,14 @@ static bool InitSanityCheck()
return true;
}
static bool AppInitServers(const util::Ref& context)
static bool AppInitServers(const util::Ref& context, NodeContext& node)
{
RPCServer::OnStarted(&OnRPCStarted);
RPCServer::OnStopped(&OnRPCStopped);
if (!InitHTTPServer())
return false;
StartRPC();
node.rpc_interruption_point = RpcInterruptionPoint;
if (!StartHTTPRPC(context))
return false;
if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE)) StartREST(context);
@ -1405,7 +1406,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node)
if (gArgs.GetBoolArg("-server", false))
{
uiInterface.InitMessage_connect(SetRPCWarmupStatus);
if (!AppInitServers(context))
if (!AppInitServers(context, node))
return InitError(_("Unable to start HTTP server. See debug log for details."));
}