Ticket 26. The const MODULE_SETTINGS & ms parameter added to the

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

diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp
index 0ee78fa84165467d1748e651c5744d407e8d2693..a50a0a657ec708f37accbc0d5adfa7ab1d3ad218 100644 (file)
--- a/projects/stargazer/settings_impl.cpp
+++ b/projects/stargazer/settings_impl.cpp
@@ -32,38 +32,20 @@ $Author: faust $
 #include <cerrno>
 #include <string>
 
 #include <cerrno>
 #include <string>
 

+#include "stg/logger.h"
+#include "stg/dotconfpp.h"

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "stg_logger.h"
-#include "dotconfpp.h"

 
 

-using namespace std;
-
-//-----------------------------------------------------------------------------
-SETTINGS_IMPL::SETTINGS_IMPL()
-    : confDir("/etc/stargazer"),
-      scriptsDir("/etc/stargazer"),
-      pidFile("/var/run/stargazer.pid"),
-      monitoring(false),
-      detailStatWritePeriod(dsPeriod_1_6),
-      statWritePeriod(10),
-      stgExecMsgKey(5555),
-      executersNum(1),
-      fullFee(false),
-      dayFee(0),
-      dayResetTraff(0),
-      spreadFee(false),
-      freeMbAllowInet(false),
-      dayFeeIsLastDay(false),
-      writeFreeMbTraffCost(false),
-      showFeeInCash(true),
-      messageTimeout(0),
-      logger(GetStgLogger())
-{
-}

 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)

-    : confDir(cd),
-      scriptsDir(cd),
+    : modulesPath("/usr/lib/stg"),
+      dirName(DIR_NUM),
+      confDir(cd.empty() ? "/etc/stargazer" : cd),
+      scriptsDir(confDir),
+      rules(confDir + "/rules"),
+      logFile("/var/log/stargazer.log"),
+      pidFile("/var/run/stargazer.pid"),
+      monitorDir("/var/stargazer/monitoring"),

       monitoring(false),
       detailStatWritePeriod(dsPeriod_1_6),
       statWritePeriod(10),
       monitoring(false),
       detailStatWritePeriod(dsPeriod_1_6),
       statWritePeriod(10),


@@ -78,98 +60,79 @@ SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),

+      feeChargeType(0),
+      reconnectOnTariffChange(false),

       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)
       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)

-    : confDir(rval.confDir),
+    : SETTINGS(),
+      strError(),
+      modulesPath(rval.modulesPath),
+      dirName(rval.dirName),
+      confDir(rval.confDir),

       scriptsDir(rval.scriptsDir),
       scriptsDir(rval.scriptsDir),

+      rules(rval.rules),
+      logFile(rval.logFile),

       pidFile(rval.pidFile),
       pidFile(rval.pidFile),

+      monitorDir(rval.monitorDir),

       monitoring(rval.monitoring),
       monitoring(rval.monitoring),

-      detailStatWritePeriod(dsPeriod_1_6),
-      statWritePeriod(10),
+      detailStatWritePeriod(rval.detailStatWritePeriod),
+      statWritePeriod(rval.statWritePeriod),

       stgExecMsgKey(rval.stgExecMsgKey),
       executersNum(rval.executersNum),
       fullFee(rval.fullFee),
       stgExecMsgKey(rval.stgExecMsgKey),
       executersNum(rval.executersNum),
       fullFee(rval.fullFee),

-      dayFee(0),
-      dayResetTraff(0),
+      dayFee(rval.dayFee),
+      dayResetTraff(rval.dayResetTraff),

       spreadFee(rval.spreadFee),
       spreadFee(rval.spreadFee),

-      freeMbAllowInet(false),
-      dayFeeIsLastDay(false),
-      writeFreeMbTraffCost(false),
+      freeMbAllowInet(rval.freeMbAllowInet),
+      dayFeeIsLastDay(rval.dayFeeIsLastDay),
+      writeFreeMbTraffCost(rval.writeFreeMbTraffCost),

       showFeeInCash(rval.showFeeInCash),
       messageTimeout(rval.messageTimeout),
       showFeeInCash(rval.showFeeInCash),
       messageTimeout(rval.messageTimeout),

+      feeChargeType(rval.feeChargeType),
+      reconnectOnTariffChange(rval.reconnectOnTariffChange),
+      modulesSettings(rval.modulesSettings),
+      storeModuleSettings(rval.storeModuleSettings),

       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------

-int SETTINGS_IMPL::ParseYesNo(const string & value, bool * val)
-{
-if (0 == strcasecmp(value.c_str(), "yes"))
-    {
-    *val = true;
-    return 0;
-    }
-if (0 == strcasecmp(value.c_str(), "no"))
-    {
-    *val = false;
-    return 0;
-    }
-
-strError = "Incorrect value \'" + value + "\'.";
-return -1;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseInt(const string & value, int * val)
-{
-if (str2x<int>(value, *val))
-    {
-    strError = "Cannot convert \'" + value + "\' to integer.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseUnsigned(const string & value, unsigned * val)
-{
-if (str2x<unsigned>(value, *val))
-    {
-    strError = "Cannot convert \'" + value + "\' to unsigned integer.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseIntInRange(const string & value, int min, int max, int * val)
+SETTINGS_IMPL & SETTINGS_IMPL::operator=(const SETTINGS_IMPL & set)

 {
 {

-if (ParseInt(value, val) != 0)
-    return -1;
-
-if (*val < min || *val > max)
-    {
-    strError = "Value \'" + value + "\' out of range.";
-    return -1;
-    }
-
-return 0;
+    modulesPath = set.modulesPath;
+    dirName = set.dirName;
+    confDir = set.confDir;
+    scriptsDir = set.scriptsDir;
+    rules = set.rules;
+    logFile = set.logFile;
+    pidFile = set.pidFile;
+    monitorDir = set.monitorDir;
+    scriptParams = set.scriptParams;
+    monitoring = set.monitoring;
+    detailStatWritePeriod = set.detailStatWritePeriod;
+    statWritePeriod = set.statWritePeriod;
+    stgExecMsgKey = set.stgExecMsgKey;
+    executersNum = set.executersNum;
+    fullFee = set.fullFee;
+    dayFee = set.dayFee;
+    dayResetTraff = set.dayResetTraff;
+    spreadFee = set.spreadFee;
+    freeMbAllowInet = set.freeMbAllowInet;
+    dayFeeIsLastDay = set.dayFeeIsLastDay;
+    writeFreeMbTraffCost = set.writeFreeMbTraffCost;
+    showFeeInCash = set.showFeeInCash;
+    messageTimeout = set.messageTimeout;
+    feeChargeType = set.feeChargeType;
+    reconnectOnTariffChange = set.reconnectOnTariffChange;
+
+    modulesSettings = set.modulesSettings;
+    storeModuleSettings = set.storeModuleSettings;
+    return *this;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-int SETTINGS_IMPL::ParseUnsignedInRange(const string & value, unsigned min, unsigned max, unsigned * val)
-{
-if (ParseUnsigned(value, val) != 0)
-    return -1;
-
-if (*val < min || *val > max)
-    {
-    strError = "Value \'" + value + "\' out of range.";
-    return -1;
-    }
-
-return 0;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, vector<PARAM_VALUE> * params)
+int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector<PARAM_VALUE> * params)

 {
 const DOTCONFDocumentNode * childNode;
 PARAM_VALUE pv;
 {
 const DOTCONFDocumentNode * childNode;
 PARAM_VALUE pv;


@@ -179,7 +142,7 @@ pv.param = node->getName();
 
 if (node->getValue(1))
     {
 
 if (node->getValue(1))
     {

-    strError = "Unexpected value \'" + string(node->getValue(1)) + "\'.";
+    strError = "Unexpected value \'" + std::string(node->getValue(1)) + "\'.";

     return -1;
     }
 
     return -1;
     }
 


@@ -210,9 +173,9 @@ return 0;
 //-----------------------------------------------------------------------------
 void SETTINGS_IMPL::ErrorCallback(void * data, const char * buf)
 {
 //-----------------------------------------------------------------------------
 void SETTINGS_IMPL::ErrorCallback(void * data, const char * buf)
 {

-    printfd(__FILE__, buf);
+    printfd(__FILE__, "SETTINGS_IMPL::ErrorCallback() - %s\n", buf);

     SETTINGS_IMPL * settings = static_cast<SETTINGS_IMPL *>(data);
     SETTINGS_IMPL * settings = static_cast<SETTINGS_IMPL *>(data);

-    settings->logger(buf);
+    settings->logger("%s", buf);

 }
 //-----------------------------------------------------------------------------
 int SETTINGS_IMPL::ReadSettings()
 }
 //-----------------------------------------------------------------------------
 int SETTINGS_IMPL::ReadSettings()


@@ -238,7 +201,7 @@ modulesSettings.clear();
 DOTCONFDocument conf(DOTCONFDocument::CASEINSENSITIVE);
 conf.setErrorCallback(SETTINGS_IMPL::ErrorCallback, this);
 conf.setRequiredOptionNames(requiredOptions);
 DOTCONFDocument conf(DOTCONFDocument::CASEINSENSITIVE);
 conf.setErrorCallback(SETTINGS_IMPL::ErrorCallback, this);
 conf.setRequiredOptionNames(requiredOptions);

-string confFile = confDir + "/stargazer.conf";
+std::string confFile = confDir + "/stargazer.conf";

 
 if(conf.setContent(confFile.c_str()) != 0)
     {
 
 if(conf.setContent(confFile.c_str()) != 0)
     {


@@ -279,7 +242,7 @@ while (node)
         {
         if (ParseDetailStatWritePeriod(node->getValue(0)) != 0)
             {
         {
         if (ParseDetailStatWritePeriod(node->getValue(0)) != 0)
             {

-            strError = "Incorrect DetailStatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DetailStatWritePeriod value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -288,7 +251,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1440, &statWritePeriod) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1440, &statWritePeriod) != 0)
             {

-            strError = "Incorrect StatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect StatWritePeriod value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -297,7 +260,7 @@ while (node)
         {
         if (ParseInt(node->getValue(0), &stgExecMsgKey) != 0)
             {
         {
         if (ParseInt(node->getValue(0), &stgExecMsgKey) != 0)
             {

-            strError = "Incorrect ExecMsgKey value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect ExecMsgKey value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -306,7 +269,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1024, &executersNum) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1024, &executersNum) != 0)
             {

-            strError = "Incorrect ExecutersNum value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect ExecutersNum value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -315,7 +278,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayFee) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayFee) != 0)
             {

-            strError = "Incorrect DayFee value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DayFee value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -324,7 +287,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &fullFee) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &fullFee) != 0)
             {

-            strError = "Incorrect FullFee value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect FullFee value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -333,7 +296,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayResetTraff) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayResetTraff) != 0)
             {

-            strError = "Incorrect DayResetTraff value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DayResetTraff value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -342,7 +305,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &spreadFee) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &spreadFee) != 0)
             {

-            strError = "Incorrect SpreadFee value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect SpreadFee value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -351,7 +314,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &freeMbAllowInet) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &freeMbAllowInet) != 0)
             {

-            strError = "Incorrect FreeMbAllowInet value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect FreeMbAllowInet value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -360,7 +323,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &dayFeeIsLastDay) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &dayFeeIsLastDay) != 0)
             {

-            strError = "Incorrect DayFeeIsLastDay value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DayFeeIsLastDay value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -369,7 +332,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &writeFreeMbTraffCost) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &writeFreeMbTraffCost) != 0)
             {

-            strError = "Incorrect WriteFreeMbTraffCost value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect WriteFreeMbTraffCost value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -378,7 +341,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &showFeeInCash) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &showFeeInCash) != 0)
             {

-            strError = "Incorrect ShowFeeInCash value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect ShowFeeInCash value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -399,7 +362,25 @@ while (node)
         {
         if (ParseUnsigned(node->getValue(0), &messageTimeout) != 0)
             {
         {
         if (ParseUnsigned(node->getValue(0), &messageTimeout) != 0)
             {

-            strError = "Incorrect MessageTimeout value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect MessageTimeout value: \'" + std::string(node->getValue(0)) + "\'";
+            return -1;
+            }
+        }
+
+    if (strcasecmp(node->getName(), "FeeChargeType") == 0)
+        {
+        if (ParseUnsignedInRange(node->getValue(0), 0, 3, &feeChargeType) != 0)
+            {
+            strError = "Incorrect FeeChargeType value: \'" + std::string(node->getValue(0)) + "\'";
+            return -1;
+            }
+        }
+
+    if (strcasecmp(node->getName(), "ReconnectOnTariffChange") == 0)
+        {
+        if (ParseYesNo(node->getValue(0), &reconnectOnTariffChange) != 0)
+            {
+            strError = "Incorrect ReconnectOnTariffChange value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
             return -1;
             }
         }


@@ -410,6 +391,7 @@ while (node)
         if (child)
             {
             const DOTCONFDocumentNode * dirNameNode;
         if (child)
             {
             const DOTCONFDocumentNode * dirNameNode;

+            dirName.reserve(DIR_NUM);

             for (int i = 0; i < DIR_NUM; i++)
                 {
                 char strDirName[12];
             for (int i = 0; i < DIR_NUM; i++)
                 {
                 char strDirName[12];


@@ -427,7 +409,7 @@ while (node)
         {
         if (node->getValue(1))
             {
         {
         if (node->getValue(1))
             {

-            strError = "Unexpected \'" + string(node->getValue(1)) + "\'.";
+            strError = "Unexpected \'" + std::string(node->getValue(1)) + "\'.";

             return -1;
             }
 
             return -1;
             }
 


@@ -446,7 +428,7 @@ while (node)
         {
         if (node->getValue(0))
             {
         {
         if (node->getValue(0))
             {

-            strError = "Unexpected \'" + string(node->getValue(0)) + "\'.";
+            strError = "Unexpected \'" + std::string(node->getValue(0)) + "\'.";

             return -1;
             }
         const DOTCONFDocumentNode * child = node->getChildNode();
             return -1;
             }
         const DOTCONFDocumentNode * child = node->getChildNode();


@@ -469,13 +451,20 @@ while (node)
             }
         }
 
             }
         }
 

+    if (strcasecmp(node->getName(), "ScriptParams") == 0)
+        {
+        for (int i = 0; node->getValue(i) != NULL; ++i)
+            {
+            scriptParams.push_back(node->getValue(i));
+            }
+        }

     node = node->getNextNode();
     }
 
 return 0;
 }
 //-----------------------------------------------------------------------------
     node = node->getNextNode();
     }
 
 return 0;
 }
 //-----------------------------------------------------------------------------

-int SETTINGS_IMPL::ParseDetailStatWritePeriod(const string & detailStatPeriodStr)
+int SETTINGS_IMPL::ParseDetailStatWritePeriod(const std::string & detailStatPeriodStr)

 {
 if (detailStatPeriodStr == "1")
     {
 {
 if (detailStatPeriodStr == "1")
     {