X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b3bf247163c78d1bac74702459a4d53700280ebe..296c906e2689b9b5dc26d2f2d3e1e2d9e1662d3b:/projects/stargazer/plugin_runner.cpp?ds=sidebyside

diff --git a/projects/stargazer/plugin_runner.cpp b/projects/stargazer/plugin_runner.cpp
index e57a421e..8938950f 100644
--- a/projects/stargazer/plugin_runner.cpp
+++ b/projects/stargazer/plugin_runner.cpp
@@ -26,125 +26,130 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
+using STG::PluginRunner;
+using STG::Plugin;
+
 //-----------------------------------------------------------------------------
-PLUGIN_RUNNER::PLUGIN_RUNNER(const std::string & fileName,
-                             const std::string & name,
-                             const MODULE_SETTINGS & ms,
-                             ADMINS & admins,
-                             TARIFFS & tariffs,
-                             USERS & users,
-                             SERVICES & services,
-                             CORPORATIONS & corporations,
-                             TRAFFCOUNTER & traffcounter,
-                             STORE & store,
-                             const SETTINGS & settings)
+PluginRunner::PluginRunner(const std::string& fileName,
+                           const std::string& name,
+                           const ModuleSettings& ms,
+                           Admins& admins,
+                           Tariffs& tariffs,
+                           Users& users,
+                           Services& services,
+                           Corporations& corporations,
+                           TraffCounter& traffcounter,
+                           Store& store,
+                           const Settings& settings)
     : pluginFileName(fileName),
       pluginName(name),
       libHandle(NULL),
-      m_plugin(Load(ms, admins, tariffs, users, services, corporations,
+      m_plugin(load(ms, admins, tariffs, users, services, corporations,
                     traffcounter, store, settings))
 {
 }
 //-----------------------------------------------------------------------------
-PLUGIN_RUNNER::~PLUGIN_RUNNER()
+PluginRunner::~PluginRunner()
 {
-if (dlclose(libHandle))
+    delete &m_plugin;
+    if (dlclose(libHandle))
     {
-    errorStr = "Failed to unload plugin '" + pluginFileName + "': " + dlerror();
-    printfd(__FILE__, "PLUGIN_RUNNER::Unload() - %s", errorStr.c_str());
+        errorStr = "Failed to unload plugin '" + pluginFileName + "': " + dlerror();
+        printfd(__FILE__, "PluginRunner::Unload() - %s", errorStr.c_str());
     }
 }
 //-----------------------------------------------------------------------------
-int PLUGIN_RUNNER::Start()
+int PluginRunner::Start()
 {
-int res = m_plugin.Start();
-errorStr = m_plugin.GetStrError();
-return res;
+    int res = m_plugin.Start();
+    errorStr = m_plugin.GetStrError();
+    return res;
 }
 //-----------------------------------------------------------------------------
-int PLUGIN_RUNNER::Stop()
+int PluginRunner::Stop()
 {
-int res = m_plugin.Stop();
-errorStr = m_plugin.GetStrError();
-return res;
+    int res = m_plugin.Stop();
+    errorStr = m_plugin.GetStrError();
+    return res;
 }
 //-----------------------------------------------------------------------------
-int PLUGIN_RUNNER::Reload(const MODULE_SETTINGS & ms)
+int PluginRunner::Reload(const ModuleSettings& ms)
 {
-int res = m_plugin.Reload(ms);
-errorStr = m_plugin.GetStrError();
-return res;
+    int res = m_plugin.Reload(ms);
+    errorStr = m_plugin.GetStrError();
+    return res;
 }
 //-----------------------------------------------------------------------------
-PLUGIN & PLUGIN_RUNNER::Load(const MODULE_SETTINGS & ms,
-                             ADMINS & admins,
-                             TARIFFS & tariffs,
-                             USERS & users,
-                             SERVICES & services,
-                             CORPORATIONS & corporations,
-                             TRAFFCOUNTER & traffcounter,
-                             STORE & store,
-                             const SETTINGS & settings)
+Plugin & PluginRunner::load(const ModuleSettings& ms,
+                            Admins& admins,
+                            Tariffs& tariffs,
+                            Users& users,
+                            Services& services,
+                            Corporations& corporations,
+                            TraffCounter& traffcounter,
+                            Store& store,
+                            const Settings& settings)
 {
-if (pluginFileName.empty())
+    if (pluginFileName.empty())
     {
-    const std::string msg = "Empty plugin file name.";
-    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
-    throw Error(msg);
+        const std::string msg = "Empty plugin file name.";
+        printfd(__FILE__, "PluginRunner::load() - %s\n", msg.c_str());
+        throw Error(msg);
     }
 
-if (access(pluginFileName.c_str(), R_OK))
+    if (access(pluginFileName.c_str(), R_OK))
     {
-    const std::string msg = "Plugin file '" + pluginFileName + "' is missing or inaccessible.";
-    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
-    throw Error(msg);
+        const std::string msg = "Plugin file '" + pluginFileName + "' is missing or inaccessible.";
+        printfd(__FILE__, "PluginRunner::load() - %s\n", msg.c_str());
+        throw Error(msg);
     }
 
-libHandle = dlopen(pluginFileName.c_str(), RTLD_NOW);
+    libHandle = dlopen(pluginFileName.c_str(), RTLD_NOW);
 
-if (!libHandle)
+    if (!libHandle)
     {
-    std::string msg = "Error loading plugin '" + pluginFileName + "'";
-    const char* error = dlerror();
-    if (error)
-        msg = msg + ": '" + error + "'";
-    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
-    throw Error(msg);
+        std::string msg = "Error loading plugin '" + pluginFileName + "'";
+        const char* error = dlerror();
+        if (error)
+            msg = msg + ": '" + error + "'";
+        printfd(__FILE__, "PluginRunner::load() - %s\n", msg.c_str());
+        throw Error(msg);
     }
 
-PLUGIN * (*GetPlugin)();
-GetPlugin = (PLUGIN * (*)())dlsym(libHandle, "GetPlugin");
-if (!GetPlugin)
+    using Getter = Plugin* (*)();
+    auto GetPlugin = reinterpret_cast<Getter>(dlsym(libHandle, "GetPlugin"));
+    if (!GetPlugin)
     {
-    const std::string msg = "Plugin '" + pluginFileName + "' does not have GetPlugin() function. ";
-    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
-    throw Error(msg);
+        const std::string msg = "Plugin '" + pluginFileName + "' does not have GetPlugin() function. ";
+        printfd(__FILE__, "PluginRunner::load() - %s\n", msg.c_str());
+        throw Error(msg);
     }
-PLUGIN * plugin = GetPlugin();
 
-if (!plugin)
+    Plugin* plugin = GetPlugin();
+
+    if (!plugin)
     {
-    const std::string msg = "Failed to create an instance of plugin '" + pluginFileName + "'.";
-    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
-    throw Error(msg);
+        const std::string msg = "Failed to create an instance of plugin '" + pluginFileName + "'.";
+        printfd(__FILE__, "PluginRunner::load() - %s\n", msg.c_str());
+        throw Error(msg);
     }
 
-plugin->SetSettings(ms);
-plugin->SetTariffs(&tariffs);
-plugin->SetAdmins(&admins);
-plugin->SetUsers(&users);
-plugin->SetServices(&services);
-plugin->SetCorporations(&corporations);
-plugin->SetTraffcounter(&traffcounter);
-plugin->SetStore(&store);
-plugin->SetStgSettings(&settings);
+    plugin->SetSettings(ms);
+    plugin->SetTariffs(&tariffs);
+    plugin->SetAdmins(&admins);
+    plugin->SetUsers(&users);
+    plugin->SetServices(&services);
+    plugin->SetCorporations(&corporations);
+    plugin->SetTraffcounter(&traffcounter);
+    plugin->SetStore(&store);
+    plugin->SetStgSettings(&settings);
 
-if (plugin->ParseSettings())
+    if (plugin->ParseSettings())
     {
-    const std::string msg = "Plugin '" + pluginFileName + "' is unable to parse settings. " + plugin->GetStrError();
-    printfd(__FILE__, "PLUGIN_RUNNER::Load() - %s\n", msg.c_str());
-    throw Error(msg);
+        const std::string msg = "Plugin '" + pluginFileName + "' is unable to parse settings. " + plugin->GetStrError();
+        printfd(__FILE__, "PluginRunner::load() - %s\n", msg.c_str());
+        throw Error(msg);
     }
 
-return *plugin;
+    return *plugin;
 }