iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unload all python modules when modpython is unloaded.

Browse Source 
Only user modules were unloaded before.
This commit is contained in:
Alexey Sokolov
2012-01-01 16:46:21 +07:00
parent 0260558155
commit c8a4668bbf
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/modpython.cpp
View File

@@ -320,28 +320,15 @@ public:
}
virtual ~CModPython() {
const map<CString, CUser*>& users = CZNC::Get().GetUserMap();
for (map<CString, CUser*>::const_iterator i = users.begin(); i != users.end(); ++i) {
CModules& M = i->second->GetModules();
bool cont;
do {
cont = false;
for (CModules::iterator it = M.begin(); it != M.end(); ++it) {
CModule* m = *it;
CPyModule* mod = AsPyModule(m);
if (mod) {
cont = true;
bool bSuccess = false;
CString sRetMsg;
OnModuleUnloading(mod, bSuccess, sRetMsg);
if (!bSuccess) {
DEBUG("Error unloading python module in ~CModPython: " << sRetMsg);
}
break;
}
}
} while (cont);
}
PyObject* pyFunc = PyObject_GetAttrString(m_PyZNCModule, "unload_all");
PyObject* pyRes = PyObject_CallFunctionObjArgs(pyFunc, NULL);
if (!pyRes) {
CString sRetMsg = GetPyExceptionStr();
DEBUG("modpython tried to unload all modules in its destructor, but: " << sRetMsg);
}
Py_CLEAR(pyRes);
Py_CLEAR(pyFunc);
Py_CLEAR(m_PyFormatException);
Py_CLEAR(m_PyZNCModule);
Py_Finalize();