Fix rscriptd compilation errors

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

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

+#include "stg/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()
 
 using namespace std;
 
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL()

-    : confDir("/etc/stargazer"),
+    : strError(),
+      modulesPath("/usr/lib/stg"),
+      dirName(DIR_NUM),
+      confDir("/etc/stargazer"),

       scriptsDir("/etc/stargazer"),
       scriptsDir("/etc/stargazer"),

+      rules("/etc/stargazer/rules"),
+      logFile("/var/log/stargazer.log"),

       pidFile("/var/run/stargazer.pid"),
       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),


@@ -57,13 +63,22 @@ SETTINGS_IMPL::SETTINGS_IMPL()
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),

+      modulesSettings(),
+      storeModuleSettings(),

       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)

-    : confDir(cd),
+    : strError(),
+      modulesPath("/usr/lib/stg"),
+      dirName(DIR_NUM),
+      confDir(cd),

       scriptsDir(cd),
       scriptsDir(cd),

+      rules(cd + "/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,28 +93,38 @@ SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),

+      modulesSettings(),
+      storeModuleSettings(),

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

-    : confDir(rval.confDir),
+    : 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),

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

       logger(GetStgLogger())
 {
 }
       logger(GetStgLogger())
 {
 }


@@ -410,6 +435,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];