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

Rework the snotices sent when a rehash loads/unloads a module.

Browse Source 
- Fix sending a duplicate load/unload message when rehashed from
  the terminal.
- Avoid formatting the log message twice.
This commit is contained in:
Sadie Powell 2022-09-13 14:26:25 +01:00
parent 3ce0441473
commit 9155b99389
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/configreader.cpp
View File

@ -512,21 +512,22 @@ void ServerConfig::ApplyModules(User* user)
// Don't remove core_*, just remove m_*
if (InspIRCd::Match(modname, "core_*", ascii_case_insensitive_map))
continue;
if (ServerInstance->Modules.Unload(mod))
{
ServerInstance->SNO.WriteGlobalSno('r', "*** REHASH UNLOADED MODULE: %s", modname.c_str());
const std::string message = InspIRCd::Format("The %s module was unloaded.", modname.c_str());
if (user)
user->WriteNumeric(RPL_UNLOADEDMODULE, modname, InspIRCd::Format("The %s module was unloaded.", modname.c_str()));
else
ServerInstance->SNO.WriteGlobalSno('r', "The %s module was unloaded.", modname.c_str());
user->WriteNumeric(RPL_UNLOADEDMODULE, modname, message);
ServerInstance->SNO.WriteGlobalSno('r', message);
}
else
{
const std::string message = InspIRCd::Format("Failed to unload the %s module: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str());
if (user)
user->WriteNumeric(ERR_CANTUNLOADMODULE, modname, InspIRCd::Format("Failed to unload the %s module: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str()));
else
ServerInstance->SNO.WriteGlobalSno('r', "Failed to unload the %s module: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str());
user->WriteNumeric(ERR_CANTUNLOADMODULE, modname, message);
ServerInstance->SNO.WriteGlobalSno('r', message);
}
}
@ -538,18 +539,19 @@ void ServerConfig::ApplyModules(User* user)
if (ServerInstance->Modules.Load(modname))
{
ServerInstance->SNO.WriteGlobalSno('r', "*** REHASH LOADED MODULE: %s", modname.c_str());
const std::string message = InspIRCd::Format("The %s module was loaded.", modname.c_str());
if (user)
user->WriteNumeric(RPL_LOADEDMODULE, modname, InspIRCd::Format("The %s module was loaded.", modname.c_str()));
else
ServerInstance->SNO.WriteGlobalSno('r', "The %s module was loaded.", modname.c_str());
user->WriteNumeric(RPL_LOADEDMODULE, modname, message);
ServerInstance->SNO.WriteGlobalSno('r', message);
}
else
{
const std::string message = InspIRCd::Format("Failed to load the %s module: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str());
if (user)
user->WriteNumeric(ERR_CANTLOADMODULE, modname, InspIRCd::Format("Failed to load the %s module: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str()));
else
ServerInstance->SNO.WriteGlobalSno('r', "Failed to load the %s module: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str());
user->WriteNumeric(ERR_CANTLOADMODULE, modname, message);
ServerInstance->SNO.WriteGlobalSno('r', message);
}
}
}