X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4a47f1827831f31d6bc7018bb3497108581bc547..fca49a45944d877965930a623fff27a84257782c:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp?ds=sidebyside

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index ca6b8d21..0896bb85 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -20,136 +20,128 @@
 
 #include "stgconfig.h"
 
-#include "stg/plugin_creator.h"
 #include "stg/common.h"
 
 #include <algorithm>
 #include <csignal>
+#include <cstring>
+#include <cerrno>
 
-#include <unistd.h>
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-static PLUGIN_CREATOR<STG_CONFIG> stgc;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+bool STG_CONFIG_SETTINGS::ParseSettings(const STG::ModuleSettings & s)
 {
-int p;
-PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
-///////////////////////////
-pv.param = "Port";
-pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
-    {
-    errorStr = "Parameter \'Port\' not found.";
-    printfd(__FILE__, "Parameter 'Port' not found\n");
-    return -1;
-    }
-if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
-    {
-    errorStr = "Cannot parse parameter \'Port\': " + errorStr;
-    printfd(__FILE__, "%s\n", errorStr.c_str());
-    return -1;
-    }
-port = static_cast<uint16_t>(p);
-
-return 0;
+    STG::ParamValue pv;
+    std::vector<STG::ParamValue>::const_iterator pvi;
+    ///////////////////////////
+    pv.param = "Port";
+    pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+    if (pvi == s.moduleParams.end() || pvi->value.empty())
+        {
+        errorStr = "Parameter \'Port\' is not found.";
+        printfd(__FILE__, "%s\n", errorStr.c_str());
+        return false;
+        }
+    int p;
+    if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
+        {
+        errorStr = "Parameter \'Port\' should be an integral value in range (2, 65535). Actual value: '" + pvi->value[0] + "'.";
+        printfd(__FILE__, "%s\n", errorStr.c_str());
+        return false;
+        }
+    m_port = static_cast<uint16_t>(p);
+
+    pv.param = "BindAddress";
+    pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+    if (pvi != s.moduleParams.end() && !pvi->value.empty())
+        m_bindAddress = pvi->value[0];
+
+    return true;
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+extern "C" STG::Plugin * GetPlugin()
 {
-return stgc.GetPlugin();
+    static STG_CONFIG plugin;
+    return &plugin;
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 STG_CONFIG::STG_CONFIG()
-    : errorStr(),
-      stgConfigSettings(),
-      thread(),
-      nonstop(false),
+    : nonstop(false),
       isRunning(false),
-      logger(GetPluginLogger(GetStgLogger(), "conf_sg")),
-      config(logger),
-      settings()
+      logger(STG::PluginLogger::get("conf_sg")),
+      config(logger)
 {
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::ParseSettings()
 {
-int ret = stgConfigSettings.ParseSettings(settings);
-if (ret)
+    if (stgConfigSettings.ParseSettings(settings))
+        return 0;
     errorStr = stgConfigSettings.GetStrError();
-return ret;
+    return -1;
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Start()
 {
-if (isRunning)
-    return 0;
+    if (isRunning)
+        return 0;
 
-nonstop = true;
+    nonstop = true;
 
-config.SetPort(stgConfigSettings.GetPort());
+    config.SetPort(stgConfigSettings.GetPort());
+    config.SetBindAddress(stgConfigSettings.GetBindAddress());
 
-if (config.Prepare())
+    if (config.Prepare())
     {
-    errorStr = config.GetStrError();
-    return -1;
+        errorStr = config.GetStrError();
+        return -1;
     }
 
-if (pthread_create(&thread, NULL, Run, this))
-    {
-    errorStr = "Cannot create thread.";
-    printfd(__FILE__, "Cannot create thread\n");
-    logger("Cannot create thread.");
-    return -1;
-    }
-errorStr = "";
-return 0;
+    m_thread = std::jthread([this](auto token){ Run(token); });
+
+    return 0;
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Stop()
 {
-if (!isRunning)
-    return 0;
+    if (!isRunning)
+        return 0;
 
-config.Stop();
+    config.Stop();
+    m_thread.request_stop();
 
-//5 seconds to thread stops itself
-for (int i = 0; i < 25; i++)
+    //5 seconds to thread stops itself
+    for (size_t i = 0; i < 25; ++i)
     {
-    if (!isRunning)
-        break;
+        if (!isRunning)
+            break;
 
-    struct timespec ts = {0, 200000000};
-    nanosleep(&ts, NULL);
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);
     }
 
-if (isRunning)
-    return -1;
+    if (isRunning)
+        m_thread.detach();
+    else
+        m_thread.join();
 
-return 0;
+    return 0;
 }
 //-----------------------------------------------------------------------------
-void * STG_CONFIG::Run(void * d)
+void STG_CONFIG::Run(std::stop_token token)
 {
-sigset_t signalSet;
-sigfillset(&signalSet);
-pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+    sigset_t signalSet;
+    sigfillset(&signalSet);
+    pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 
-STG_CONFIG * stgConf = static_cast<STG_CONFIG *>(d);
-stgConf->isRunning = true;
+    isRunning = true;
 
-stgConf->config.Run();
+    config.Run(token);
 
-stgConf->isRunning = false;
-return NULL;
+    isRunning = false;
 }
-//-----------------------------------------------------------------------------