mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708)
This commit is contained in:
commit
30814e6064
14 changed files with 85 additions and 56 deletions
|
|
@ -90,10 +90,11 @@ public:
|
|||
void initLogging() override { InitLogging(args()); }
|
||||
void initParameterInteraction() override { InitParameterInteraction(args()); }
|
||||
bilingual_str getWarnings() override { return GetWarnings(true); }
|
||||
int getExitStatus() override { return Assert(m_context)->exit_status.load(); }
|
||||
uint32_t getLogCategories() override { return LogInstance().GetCategoryMask(); }
|
||||
bool baseInitialize() override
|
||||
{
|
||||
if (!AppInitBasicSetup(args())) return false;
|
||||
if (!AppInitBasicSetup(args(), Assert(context())->exit_status)) return false;
|
||||
if (!AppInitParameterInteraction(args(), /*use_syscall_sandbox=*/false)) return false;
|
||||
|
||||
m_context->kernel = std::make_unique<kernel::Context>();
|
||||
|
|
@ -106,7 +107,10 @@ public:
|
|||
}
|
||||
bool appInitMain(interfaces::BlockAndHeaderTipInfo* tip_info) override
|
||||
{
|
||||
return AppInitMain(*m_context, tip_info);
|
||||
if (AppInitMain(*m_context, tip_info)) return true;
|
||||
// Error during initialization, set exit status before continue
|
||||
m_context->exit_status.store(EXIT_FAILURE);
|
||||
return false;
|
||||
}
|
||||
void appShutdown() override
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue