MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:homeserver: Use central imports map; reorder constructions.

Browse source
This commit is contained in:
Jason Volk 2020-03-16 16:44:12 -07:00
parent 275f350649
commit ec5fd98f59
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/m/homeserver.h
View file

@ -67,8 +67,8 @@ struct ircd::m::homeserver
/// Configuration
std::unique_ptr<struct conf> conf;
/// Loaded modules.
std::list<ircd::module> modules;
/// Requested modules.
std::vector<string_view> modules;
/// vm
std::shared_ptr<vm::init> vm;

20
matrix/homeserver.cc
View file

@ -249,11 +249,13 @@ ircd::m::homeserver::homeserver(const struct opts *const &opts)
{
begin(matrix::module_names), end(matrix::module_names)
}
,vm
{
std::make_shared<vm::init>()
}
{
for(const auto &name : modules)
mods::imports.emplace(std::string{name}, name);
if(primary == this)
vm = std::make_shared<vm::init>();
if(primary == this && conf)
conf->load();
@ -287,17 +289,19 @@ noexcept
m::sync::pool.join();
}
signoff(*this);
if(primary == this)
mods::imports.erase("net_dns_cache"s);
vm.reset();
if(primary == this)
vm.reset();
if(primary == this)
_fetch.reset(nullptr);
while(!modules.empty())
modules.pop_back();
if(primary == this)
for(auto rit(rbegin(modules)); rit != rend(modules); ++rit)
mods::imports.erase(*rit);
}
//