Merge branch 'stg-2.409'

[stg.git] / projects / stargazer / plugin_runner.h

diff --git a/projects/stargazer/plugin_runner.h b/projects/stargazer/plugin_runner.h
index 1402d2ef48a63fa2b97c6360363f513cd62274ed..2d0c22c4e069145cbc0f6adf35be40aa4b8c1eea 100644 (file)
--- a/projects/stargazer/plugin_runner.h
+++ b/projects/stargazer/plugin_runner.h
@@ -46,6 +46,7 @@ public:
     };
 
     PLUGIN_RUNNER(const std::string & pluginFileName,
     };
 
     PLUGIN_RUNNER(const std::string & pluginFileName,

+                  const std::string & pluginName,

                   const MODULE_SETTINGS & ms,
                   ADMINS & admins,
                   TARIFFS & tariffs,
                   const MODULE_SETTINGS & ms,
                   ADMINS & admins,
                   TARIFFS & tariffs,


@@ -59,13 +60,14 @@ public:
 
     int             Start();
     int             Stop();
 
     int             Start();
     int             Stop();

-    int             Reload();
+    int             Reload(const MODULE_SETTINGS & ms);

     int             Restart();
     bool            IsRunning() { return m_plugin.IsRunning(); }
 
     const std::string & GetStrError() const { return errorStr; }
     PLUGIN &        GetPlugin() { return m_plugin; }
     const std::string & GetFileName() const { return pluginFileName; }
     int             Restart();
     bool            IsRunning() { return m_plugin.IsRunning(); }
 
     const std::string & GetStrError() const { return errorStr; }
     PLUGIN &        GetPlugin() { return m_plugin; }
     const std::string & GetFileName() const { return pluginFileName; }

+    const std::string & GetName() const { return pluginName; }

 
     uint16_t        GetStartPosition() const { return m_plugin.GetStartPosition(); }
     uint16_t        GetStopPosition() const { return m_plugin.GetStopPosition(); }
 
     uint16_t        GetStartPosition() const { return m_plugin.GetStartPosition(); }
     uint16_t        GetStopPosition() const { return m_plugin.GetStopPosition(); }


@@ -85,6 +87,7 @@ private:
                   const SETTINGS & settings);
 
     std::string     pluginFileName;
                   const SETTINGS & settings);
 
     std::string     pluginFileName;

+    std::string     pluginName;

     void *          libHandle;
 
     PLUGIN &        m_plugin;
     void *          libHandle;
 
     PLUGIN &        m_plugin;