const std::vector<MODULE_SETTINGS> & modSettings(settings.GetModulesSettings());
for (size_t i = 0; i < modSettings.size(); i++)
{
- std::string modulePath = basePath + "/mod_" + modSettings[i].moduleName + ".so";
std::string moduleName = modSettings[i].moduleName;
+ std::string modulePath = basePath + "/mod_" + moduleName + ".so";
printfd(__FILE__, "Module: %s\n", modulePath.c_str());
try
{
PluginManager::~PluginManager()
{
- std::sort(m_modules.begin(), m_modules.end(), StopModCmp);
- for (size_t i = 0; i < m_modules.size(); ++i)
- {
- PLUGIN & plugin = m_modules[i]->GetPlugin();
- if (m_modules[i]->Stop())
- {
- m_log("Failed to stop module '%s': '%s'", plugin.GetVersion().c_str(),
- plugin.GetStrError().c_str());
- printfd(__FILE__, "Failed to stop module '%s': '%s'\n", plugin.GetVersion().c_str(),
- plugin.GetStrError().c_str());
- }
- else
- {
- m_log("Module '%s' stopped successfully.", plugin.GetVersion().c_str());
- printfd(__FILE__, "Module '%s' stopped successfully.\n", plugin.GetVersion().c_str());
- }
- }
+ stop();
for (size_t i = 0; i < m_modules.size(); ++i)
delete m_modules[i];
}
{
for (size_t j = 0; j < modSettings.size(); j++)
{
- if (modSettings[j].moduleName == m_modules[i]->GetName())
- {
+ if (modSettings[j].moduleName == m_modules[i]->GetName())
+ {
PLUGIN & plugin = m_modules[i]->GetPlugin();
if (m_modules[i]->Reload(modSettings[j]))
{
printfd(__FILE__, "Error reloading module '%s': '%s'\n", plugin.GetVersion().c_str(),
plugin.GetStrError().c_str());
}
- }
+ break;
+ }
+ }
+ }
+}
+
+void PluginManager::stop()
+{
+ std::sort(m_modules.begin(), m_modules.end(), StopModCmp);
+ for (size_t i = 0; i < m_modules.size(); ++i)
+ {
+ if (!m_modules[i]->IsRunning())
+ continue;
+ PLUGIN & plugin = m_modules[i]->GetPlugin();
+ if (m_modules[i]->Stop())
+ {
+ m_log("Failed to stop module '%s': '%s'", plugin.GetVersion().c_str(),
+ plugin.GetStrError().c_str());
+ printfd(__FILE__, "Failed to stop module '%s': '%s'\n", plugin.GetVersion().c_str(),
+ plugin.GetStrError().c_str());
+ }
+ else
+ {
+ m_log("Module '%s' stopped successfully.", plugin.GetVersion().c_str());
+ printfd(__FILE__, "Module '%s' stopped successfully.\n", plugin.GetVersion().c_str());
}
}
}