Fix sizeof.

[stg.git] / projects / stargazer / plugin_mgr.cpp

diff --git a/projects/stargazer/plugin_mgr.cpp b/projects/stargazer/plugin_mgr.cpp
index b7ead90d9777cb700bc63b3df7231a529c87a11d..9d0f1365ba0e7f0c779bfe30f492f2c880a61d86 100644 (file)
--- a/projects/stargazer/plugin_mgr.cpp
+++ b/projects/stargazer/plugin_mgr.cpp
@@ -33,44 +33,45 @@
 #include "stg/logger.h"
 
 using STG::PluginManager;
 #include "stg/logger.h"
 
 using STG::PluginManager;

+using STG::PluginRunner;

 
 namespace
 {
 
 
 namespace
 {
 

-bool StartModCmp(const PLUGIN_RUNNER * lhs, const PLUGIN_RUNNER * rhs)
+bool StartModCmp(const PluginRunner * lhs, const PluginRunner * rhs)

 {
     return lhs->GetStartPosition() < rhs->GetStartPosition();
 }
 
 {
     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
 
 {
     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();
 {
     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++)
     {
     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 moduleName = modSettings[i].moduleName;

+        std::string modulePath = basePath + "/mod_" + moduleName + ".so";

         printfd(__FILE__, "Module: %s\n", modulePath.c_str());
         try
         {
             m_modules.push_back(
         printfd(__FILE__, "Module: %s\n", modulePath.c_str());
         try
         {
             m_modules.push_back(

-                new PLUGIN_RUNNER(modulePath, moduleName, modSettings[i], admins, tariffs,
+                new PluginRunner(modulePath, moduleName, modSettings[i], admins, tariffs,

                                   users, services, corporations, traffcounter,
                                   store, settings)
             );
         }
                                   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());
         {
             m_log(ex.what());
             printfd(__FILE__, "%s\n", ex.what());


@@ -80,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)
     {
     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(),
         if (m_modules[i]->Start())
         {
             m_log("Failed to start module '%s': '%s'", plugin.GetVersion().c_str(),


@@ -98,37 +99,21 @@ PluginManager::PluginManager(const SETTINGS_IMPL& settings,
 
 PluginManager::~PluginManager()
 {
 
 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 i = 0; i < m_modules.size(); ++i)
         delete m_modules[i];
 }
 

-void PluginManager::reload(const SETTINGS_IMPL& settings)
+void PluginManager::reload(const SettingsImpl& settings)

 {
 {

-    const std::vector<MODULE_SETTINGS> & modSettings(settings.GetModulesSettings());
+    const std::vector<ModuleSettings> & modSettings(settings.GetModulesSettings());

     for (size_t i = 0; i < m_modules.size(); ++i)
     {
         for (size_t j = 0; j < modSettings.size(); j++)
         {
     for (size_t i = 0; i < m_modules.size(); ++i)
     {
         for (size_t j = 0; j < modSettings.size(); j++)
         {

-           if (modSettings[j].moduleName == m_modules[i]->GetName()) 
-           {
-                PLUGIN & plugin = m_modules[i]->GetPlugin();
+            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(),
                 if (m_modules[i]->Reload(modSettings[j]))
                 {
                     m_log("Error reloading module '%s': '%s'", plugin.GetVersion().c_str(),


@@ -136,7 +121,31 @@ void PluginManager::reload(const SETTINGS_IMPL& settings)
                     printfd(__FILE__, "Error reloading module '%s': '%s'\n", 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;
+            }
+        }
+    }
+}
+
+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;
+        auto& 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());

         }
     }
 }
         }
     }
 }