X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a29ab1ce9a9f77d794660a556d80b06d7584350d..f298b4a17d43ba8e3d9125a9135b60fbd29b6b6b:/projects/stargazer/plugin_mgr.cpp

diff --git a/projects/stargazer/plugin_mgr.cpp b/projects/stargazer/plugin_mgr.cpp
index eec1d656..85215c7b 100644
--- a/projects/stargazer/plugin_mgr.cpp
+++ b/projects/stargazer/plugin_mgr.cpp
@@ -59,8 +59,8 @@ PluginManager::PluginManager(const SETTINGS_IMPL& settings,
     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
         {
@@ -98,23 +98,7 @@ PluginManager::PluginManager(const SETTINGS_IMPL& settings,
 
 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];
 }
@@ -136,7 +120,31 @@ void PluginManager::reload(const SETTINGS_IMPL& settings)
                     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());
+        }
+    }
+}