Ticket 37. The 'change_policy' parameter replaced by 'changePolicy' in the

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / stgconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index ca6b8d2127d2a4b0de829b6f0e0fba7e5cecb138..73f58145f6beb23bcf1986575362b844d602dafb 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -25,8 +25,8 @@
 
 #include <algorithm>
 #include <csignal>
 
 #include <algorithm>
 #include <csignal>

-
-#include <unistd.h>
+#include <cstring>
+#include <cerrno>

 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -35,34 +35,39 @@ static PLUGIN_CREATOR<STG_CONFIG> stgc;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+bool STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & 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;
+    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() || 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" PLUGIN * GetPlugin()

 {
 return stgc.GetPlugin();
 }
 {
 return stgc.GetPlugin();
 }


@@ -70,86 +75,83 @@ return stgc.GetPlugin();
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 STG_CONFIG::STG_CONFIG()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 STG_CONFIG::STG_CONFIG()

-    : errorStr(),
-      stgConfigSettings(),
-      thread(),
-      nonstop(false),
+    : nonstop(false),

       isRunning(false),
       logger(GetPluginLogger(GetStgLogger(), "conf_sg")),
       isRunning(false),
       logger(GetPluginLogger(GetStgLogger(), "conf_sg")),

-      config(logger),
-      settings()
+      config(logger)

 {
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::ParseSettings()
 {
 {
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::ParseSettings()
 {

-int ret = stgConfigSettings.ParseSettings(settings);
-if (ret)
+    if (stgConfigSettings.ParseSettings(settings))
+        return 0;

     errorStr = stgConfigSettings.GetStrError();
     errorStr = stgConfigSettings.GetStrError();

-return ret;
+    return -1;

 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Start()
 {
 }
 //-----------------------------------------------------------------------------
 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))
+    if (pthread_create(&thread, NULL, Run, this))

     {
     {

-    errorStr = "Cannot create thread.";
-    printfd(__FILE__, "Cannot create thread\n");
-    logger("Cannot create thread.");
-    return -1;
+        errorStr = std::string("Cannot create thread: '") + strerror(errno) + "'.";
+        printfd(__FILE__, "%s\n", errorStr.c_str());
+        logger(errorStr);
+        return -1;

     }
     }

-errorStr = "";
-return 0;
+
+    return 0;

 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Stop()
 {
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Stop()
 {

-if (!isRunning)
-    return 0;
+    if (!isRunning)
+        return 0;

 
 

-config.Stop();
+    config.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)
+        return -1;

 
 

-return 0;
+    return 0;

 }
 //-----------------------------------------------------------------------------
 void * STG_CONFIG::Run(void * d)
 {
 }
 //-----------------------------------------------------------------------------
 void * STG_CONFIG::Run(void * d)
 {

-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;
+    STG_CONFIG & stgConf = *static_cast<STG_CONFIG *>(d);
+    stgConf.isRunning = true;

 
 

-stgConf->config.Run();
+    stgConf.config.Run();

 
 

-stgConf->isRunning = false;
-return NULL;
+    stgConf.isRunning = false;
+
+    return NULL;

 }
 }

-//-----------------------------------------------------------------------------