adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-03 00:11:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow perl modules to be loaded not by modperl

Browse Source
This commit is contained in:
Alexey Sokolov
2012-07-28 19:35:22 +07:00
parent ff755b8812
commit 3145c5054c
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modperl.cpp
+14 -3
View File
@@ -115,6 +115,7 @@ public:
virtual EModRet OnModuleUnloading(CModule* pModule, bool& bSuccess, CString& sRetMsg) {
CPerlModule* pMod = AsPerlModule(pModule);
if (pMod) {
EModRet result = HALT;
CString sModName = pMod->GetModName();
PSTART;
XPUSHs(pMod->GetPerlObj());
@@ -122,13 +123,23 @@ public:
if (SvTRUE(ERRSV)) {
bSuccess = false;
sRetMsg = PString(ERRSV);
} else if (ret < 1 || 2 < ret) {
sRetMsg = "Error: Perl ZNC::Core::UnloadModule returned " + CString(ret) + " values.";
bSuccess = false;
result = HALT;
} else {
bSuccess = true;
sRetMsg = "Module [" + sModName + "] unloaded";
int bUnloaded = SvUV(ST(0));
if (bUnloaded) {
bSuccess = true;
sRetMsg = "Module [" + sModName + "] unloaded";
result = HALT;
} else {
result = CONTINUE; // module wasn't loaded by modperl. Perhaps a module-provider written in perl did that.
}
}
PEND;
DEBUG(__PRETTY_FUNCTION__ << " " << sRetMsg);
return HALT;
return result;
}
return CONTINUE;
}