ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 18:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ignore <module> tags for modules that are already loaded.

Browse Source 
This allows us to do user friendly things like loading the alias
module in the example alias files.
This commit is contained in:
Peter Powell 2017-10-18 04:00:04 +01:00
parent aac644de3d
commit 3b927b48cc
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/conf/services/generic.conf.example
View File

@ -1,6 +1,8 @@
# This file contains aliases and nickname reservations which are used
# by all common services implementations.
<module name="alias">
# Long hand aliases for services pseudoclients.
<alias text="BOTSERV" replace="PRIVMSG $requirement :$2-" requires="BotServ" uline="yes">
<alias text="CHANSERV" replace="PRIVMSG $requirement :$2-" requires="ChanServ" uline="yes">

4
src/configreader.cpp
View File

@ -726,6 +726,10 @@ void ServerConfig::ApplyModules(User* user)
for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
{
// Skip modules which are already loaded.
if (ServerInstance->Modules->Find(*adding))
continue;
if (ServerInstance->Modules->Load(*adding))
{
ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());

10
src/modules.cpp
View File

@ -468,10 +468,14 @@ void ModuleManager::LoadAll()
for (ConfigIter i = tags.first; i != tags.second; ++i)
{
ConfigTag* tag = i->second;
std::string name = tag->getString("name");
this->NewServices = &servicemap[ExpandModName(name)];
std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
std::string name = ExpandModName(tag->getString("name"));
this->NewServices = &servicemap[name];
// Skip modules which are already loaded.
if (Modules.find(name) != Modules.end())
continue;
std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
if (!this->Load(name, true))
{
ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());