MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-06 20:18:59 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Move module name list out of m::matrix object to internal.

Browse source
This commit is contained in:
Jason Volk 2022-03-21 15:23:47 -07:00
parent 05b38fd0f1
commit fb771478ee
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,15 +39,14 @@ namespace ircd::m
IRCD_OVERLOAD(generate)
extern struct log::log log;
extern const uint16_t canon_port;
extern const string_view canon_service;
extern struct log::log log;
}
namespace ircd
{
using m::matrix;
extern const std::vector<string_view> module_names;
extern const std::vector<string_view> module_names_optional;
}
#include "name.h"

2
matrix/homeserver.cc
View file

@ -240,7 +240,7 @@ try
}
,modules
{
begin(matrix::module_names), end(matrix::module_names)
begin(m::module_names), end(m::module_names)
}
{
if(ircd::mods::autoload)

8
matrix/matrix.cc
View file

@ -42,8 +42,8 @@ ircd::m::canon_service
/// This is an ordered list for loading and unloading modules. This is not the
/// solution I really want at all so consider it temporary. Modules are loaded
/// in the order of the lines and unloaded in reverse order.
decltype(ircd::m::matrix::module_names)
ircd::m::matrix::module_names
decltype(ircd::m::module_names)
ircd::m::module_names
{
"well_known",
"web_root",
@ -183,8 +183,8 @@ ircd::m::matrix::module_names
/// This is a list of modules that are considered "optional" and any loading
/// error for them will not propagate and interrupt m::init.
decltype(ircd::m::matrix::module_names_optional)
ircd::m::matrix::module_names_optional
decltype(ircd::m::module_names_optional)
ircd::m::module_names_optional
{
"web_hook",
};