X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/367181dd32e2f94d68f3f040bd9d9a20ba1250c3..0907aa4037b12b6b88ee24495d4577a064d4f8db:/projects/stargazer/plugin_mgr.cpp

diff --git a/projects/stargazer/plugin_mgr.cpp b/projects/stargazer/plugin_mgr.cpp
index b87ab277..9d0f1365 100644
--- a/projects/stargazer/plugin_mgr.cpp
+++ b/projects/stargazer/plugin_mgr.cpp
@@ -33,43 +33,45 @@
 #include "stg/logger.h"
 
 using STG::PluginManager;
+using STG::PluginRunner;
 
 namespace
 {
 
-bool StartModCmp(const PLUGIN_RUNNER * lhs, const PLUGIN_RUNNER * rhs)
+bool StartModCmp(const PluginRunner * lhs, const PluginRunner * rhs)
 {
     return lhs->GetStartPosition() < rhs->GetStartPosition();
 }
 
-bool StopModCmp(const PLUGIN_RUNNER * lhs, const PLUGIN_RUNNER * rhs)
+bool StopModCmp(const PluginRunner * lhs, const PluginRunner * rhs)
 {
     return lhs->GetStopPosition() > rhs->GetStopPosition();
 }
 
 } // namespace anonymous
 
-PluginManager::PluginManager(const SETTINGS_IMPL& settings,
-                             STORE& store, ADMINS_IMPL& admins, TARIFFS_IMPL& tariffs,
-                             SERVICES_IMPL& services, CORPORATIONS_IMPL& corporations,
-                             USERS_IMPL& users, TRAFFCOUNTER_IMPL& traffcounter)
-    : m_log(GetStgLogger())
+PluginManager::PluginManager(const SettingsImpl& settings,
+                             Store& store, AdminsImpl& admins, TariffsImpl& tariffs,
+                             ServicesImpl& services, CorporationsImpl& corporations,
+                             UsersImpl& users, TraffCounterImpl& traffcounter)
+    : m_log(Logger::get())
 {
     std::string basePath = settings.GetModulesPath();
-    const std::vector<MODULE_SETTINGS> & modSettings(settings.GetModulesSettings());
+    const std::vector<ModuleSettings> & 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
         {
             m_modules.push_back(
-                new PLUGIN_RUNNER(modulePath, modSettings[i], admins, tariffs,
+                new PluginRunner(modulePath, moduleName, modSettings[i], admins, tariffs,
                                   users, services, corporations, traffcounter,
                                   store, settings)
             );
         }
-        catch (const PLUGIN_RUNNER::Error & ex)
+        catch (const PluginRunner::Error & ex)
         {
             m_log(ex.what());
             printfd(__FILE__, "%s\n", ex.what());
@@ -79,7 +81,7 @@ PluginManager::PluginManager(const SETTINGS_IMPL& settings,
     std::sort(m_modules.begin(), m_modules.end(), StartModCmp);
     for (size_t i = 0; i < m_modules.size(); ++i)
     {
-        PLUGIN & plugin = m_modules[i]->GetPlugin();
+        auto& plugin = m_modules[i]->GetPlugin();
         if (m_modules[i]->Start())
         {
             m_log("Failed to start module '%s': '%s'", plugin.GetVersion().c_str(),
@@ -102,17 +104,25 @@ PluginManager::~PluginManager()
         delete m_modules[i];
 }
 
-void PluginManager::reload()
+void PluginManager::reload(const SettingsImpl& settings)
 {
+    const std::vector<ModuleSettings> & modSettings(settings.GetModulesSettings());
     for (size_t i = 0; i < m_modules.size(); ++i)
     {
-        PLUGIN & plugin = m_modules[i]->GetPlugin();
-        if (m_modules[i]->Reload())
+        for (size_t j = 0; j < modSettings.size(); j++)
         {
-            m_log("Error reloading module '%s': '%s'", plugin.GetVersion().c_str(),
-                                                       plugin.GetStrError().c_str());
-            printfd(__FILE__, "Error reloading module '%s': '%s'\n", plugin.GetVersion().c_str(),
-                                                                     plugin.GetStrError().c_str());
+            if (modSettings[j].moduleName == m_modules[i]->GetName())
+            {
+                auto& plugin = m_modules[i]->GetPlugin();
+                if (m_modules[i]->Reload(modSettings[j]))
+                {
+                    m_log("Error reloading module '%s': '%s'", plugin.GetVersion().c_str(),
+                                                               plugin.GetStrError().c_str());
+                    printfd(__FILE__, "Error reloading module '%s': '%s'\n", plugin.GetVersion().c_str(),
+                                                                             plugin.GetStrError().c_str());
+                }
+                break;
+            }
         }
     }
 }
@@ -124,7 +134,7 @@ void PluginManager::stop()
     {
         if (!m_modules[i]->IsRunning())
             continue;
-        PLUGIN & plugin = m_modules[i]->GetPlugin();
+        auto& plugin = m_modules[i]->GetPlugin();
         if (m_modules[i]->Stop())
         {
             m_log("Failed to stop module '%s': '%s'", plugin.GetVersion().c_str(),