MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-10 05:58:56 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Reorg init/fini sequence.

Browse source
This commit is contained in:
Jason Volk 2018-09-21 14:59:58 -07:00
parent ae36485d13
commit 452f9a9abb
3 changed files with 79 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/ircd/m/m.h
View file

@ -60,17 +60,25 @@ namespace ircd::m::vm
struct ircd::m::init
{
struct listeners;
struct modules;
self::init _self;
dbs::init _dbs;
std::unique_ptr<modules> _modules;
static void bootstrap();
void init_imports();
void init_keys();
void close();
public:
init(const string_view &origin);
~init() noexcept;
};
struct ircd::m::init::modules
{
void init_imports();
void init_keys();
modules();
~modules() noexcept;
};

9
ircd/ircd.cc
View file

@ -252,11 +252,18 @@ noexcept try
// executes backwards from this point and shuts down IRCd.
ctx::wait();
}
catch(const m::error &e)
{
log::critical
{
"IRCd main exited :%s %s", e.what(), e.content
};
}
catch(...)
{
log::critical
{
"IRCd main exited: %s", what(std::current_exception())
"IRCd main exited :%s", what(std::current_exception())
};
}

97
ircd/m/m.cc
View file

@ -42,24 +42,30 @@ try
{
origin
}
,_modules
{
std::make_unique<modules>()
}
{
init_keys();
init_imports();
presence::set(me, "online", me_online_status_msg);
}
catch(const m::error &e)
{
log::error
log::critical
{
log, "%s %s", e.what(), e.content
log, "Failed to start matrix :%s %s", e.what(), e.content
};
throw;
}
catch(const std::exception &e)
{
log::error
log::critical
{
log, "%s", e.what()
log, "Failed to start matrix :%s", e.what()
};
throw;
}
ircd::m::init::~init()
@ -67,8 +73,6 @@ noexcept try
{
if(!std::current_exception())
presence::set(me, "offline", me_offline_status_msg);
mods::imports.clear();
}
catch(const m::error &e)
{
@ -86,16 +90,54 @@ ircd::m::init::close()
mods::imports.erase("s_listen"s);
}
void
ircd::m::init::init_keys()
ircd::m::init::modules::modules()
try
{
mods::imports.emplace("s_keys"s, "s_keys"s);
const unwind::exceptional uw{[]
init_keys();
init_imports();
}
catch(const m::error &e)
{
const std::string what(e.what());
const std::string content(e.content);
const ctx::exception_handler eh;
log::critical
{
mods::imports.erase("s_keys"s);
}};
log, "%s %s", what, content
};
mods::imports.clear();
throw m::error
{
"M_INIT_ERROR", "Failed to start :%s :%s", what, content
};
}
catch(const std::exception &e)
{
const std::string what(e.what());
const ctx::exception_handler eh;
log::critical
{
log, "%s", what
};
mods::imports.clear();
throw m::error
{
"M_INIT_ERROR", "Failed to start :%s", what
};
}
catch(const ctx::terminated &)
{
const ctx::exception_handler eh;
mods::imports.clear();
throw ctx::terminated{};
}
void
ircd::m::init::modules::init_keys()
{
mods::imports.emplace("s_keys"s, "s_keys"s);
mods::import<void ()> init_my_keys
{
"s_keys", "init_my_keys"
@ -103,19 +145,9 @@ try
init_my_keys();
}
catch(const std::exception &e)
{
log::error
{
log, "Failed to initialize server keys :%s", e.what()
};
throw;
}
void
ircd::m::init::init_imports()
try
ircd::m::init::modules::init_imports()
{
if(ircd::noautomod)
{
@ -151,20 +183,11 @@ try
if(db::sequence(*dbs::events) == 0)
bootstrap();
}
catch(const std::exception &e)
ircd::m::init::modules::~modules()
noexcept
{
const ctx::exception_handler eh;
mods::imports.clear();
throw m::error
{
"M_INIT_ERROR", "%s", e.what()
};
}
catch(const ctx::terminated &)
{
const ctx::exception_handler eh;
mods::imports.clear();
throw ctx::terminated{};
}
void