adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-01 22:43:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Load global modules before users.

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2118 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
darthgandalf
2010-09-07 09:52:49 +00:00
parent 8af157cc69
commit 9109df9227
1 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
+38 -43
View File
@@ -1576,6 +1576,43 @@ bool CZNC::DoRehash(CString& sError)
CUtils::PrintError(sError);
return false;
}
CString sModRet;
CModule *pOldMod;
pOldMod = GetModules().FindModule(sModName);
if (!pOldMod) {
CUtils::PrintAction("Loading Global Module [" + sModName + "]");
bool bModRet = GetModules().LoadModule(sModName, sArgs, NULL, sModRet);
// If the module was loaded, sModRet contains
// "Loaded Module [name] ..." and we strip away this beginning.
if (bModRet)
sModRet = sModRet.Token(1, true, sModName + "] ");
CUtils::PrintStatus(bModRet, sModRet);
if (!bModRet) {
sError = sModRet;
return false;
}
} else if (pOldMod->GetArgs() != sArgs) {
CUtils::PrintAction("Reloading Global Module [" + sModName + "]");
bool bModRet = GetModules().ReloadModule(sModName, sArgs, NULL, sModRet);
// If the module was loaded, sModRet contains
// "Loaded Module [name] ..." and we strip away this beginning.
if (bModRet)
sModRet = sModRet.Token(1, true, sModName + "] ");
CUtils::PrintStatus(bModRet, sModRet);
if (!bModRet) {
sError = sModRet;
return false;
}
} else
CUtils::PrintMessage("Module [" + sModName + "] already loaded.");
msModules[sModName] = sArgs;
continue;
} else if (sName.Equals("ISpoofFormat")) {
@@ -1640,49 +1677,7 @@ bool CZNC::DoRehash(CString& sError)
}
}
// First step: Load and reload new modules or modules with new arguments
for (MCString::iterator it = msModules.begin(); it != msModules.end(); ++it) {
CString sModName = it->first;
CString sArgs = it->second;
CString sModRet;
CModule *pOldMod;
pOldMod = GetModules().FindModule(sModName);
if (!pOldMod) {
CUtils::PrintAction("Loading Global Module [" + sModName + "]");
bool bModRet = GetModules().LoadModule(sModName, sArgs, NULL, sModRet);
// If the module was loaded, sModRet contains
// "Loaded Module [name] ..." and we strip away this beginning.
if (bModRet)
sModRet = sModRet.Token(1, true, sModName + "] ");
CUtils::PrintStatus(bModRet, sModRet);
if (!bModRet) {
sError = sModRet;
return false;
}
} else if (pOldMod->GetArgs() != sArgs) {
CUtils::PrintAction("Reloading Global Module [" + sModName + "]");
bool bModRet = GetModules().ReloadModule(sModName, sArgs, NULL, sModRet);
// If the module was loaded, sModRet contains
// "Loaded Module [name] ..." and we strip away this beginning.
if (bModRet)
sModRet = sModRet.Token(1, true, sModName + "] ");
CUtils::PrintStatus(bModRet, sModRet);
if (!bModRet) {
sError = sModRet;
return false;
}
} else
CUtils::PrintMessage("Module [" + sModName + "] already loaded.");
}
// Second step: Unload modules which are no longer in the config
// Unload modules which are no longer in the config
set<CString> ssUnload;
for (size_t i = 0; i < GetModules().size(); i++) {
CModule *pCurMod = GetModules()[i];