Ticket 12. The 'stopOnError(rval.stopOnError)' property moved in the

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

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 7dc742f52f42e0243bcd11e65bc800663e574b42..f35eda0dc726033513123a6a712194a82795376d 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -58,7 +58,6 @@ class DOTCONFDocumentNode;
 //-----------------------------------------------------------------------------
 class SETTINGS_IMPL : public SETTINGS {
 public:
 //-----------------------------------------------------------------------------
 class SETTINGS_IMPL : public SETTINGS {
 public:

-    SETTINGS_IMPL();

     SETTINGS_IMPL(const std::string &);
     SETTINGS_IMPL(const SETTINGS_IMPL &);
     virtual ~SETTINGS_IMPL() {}
     SETTINGS_IMPL(const std::string &);
     SETTINGS_IMPL(const SETTINGS_IMPL &);
     virtual ~SETTINGS_IMPL() {}


@@ -97,7 +96,7 @@ public:
     const MODULE_SETTINGS & GetStoreModuleSettings() const
         { return storeModuleSettings; }
     const std::vector<MODULE_SETTINGS> & GetModulesSettings() const
     const MODULE_SETTINGS & GetStoreModuleSettings() const
         { return storeModuleSettings; }
     const std::vector<MODULE_SETTINGS> & GetModulesSettings() const

-        { return modulesSettings; }                
+        { return modulesSettings; }

     const std::vector<std::string> & GetScriptParams() const { return scriptParams; }
 
 private:
     const std::vector<std::string> & GetScriptParams() const { return scriptParams; }
 
 private:


@@ -117,7 +116,7 @@ private:
     std::string rules;
     std::string logFile;
     std::string pidFile;
     std::string rules;
     std::string logFile;
     std::string pidFile;

-    std::string monitorDir;        
+    std::string monitorDir;

     std::vector<std::string> scriptParams;
     bool        monitoring;
     unsigned    detailStatWritePeriod;
     std::vector<std::string> scriptParams;
     bool        monitoring;
     unsigned    detailStatWritePeriod;


@@ -129,6 +128,7 @@ private:
     unsigned    dayResetTraff;
     bool        spreadFee;
     bool        freeMbAllowInet;
     unsigned    dayResetTraff;
     bool        spreadFee;
     bool        freeMbAllowInet;

+    bool        stopOnError;

     bool        dayFeeIsLastDay;
     bool        writeFreeMbTraffCost;
     bool        showFeeInCash;
     bool        dayFeeIsLastDay;
     bool        writeFreeMbTraffCost;
     bool        showFeeInCash;


@@ -137,7 +137,7 @@ private:
     bool        reconnectOnTariffChange;
 
     std::vector<MODULE_SETTINGS> modulesSettings;
     bool        reconnectOnTariffChange;
 
     std::vector<MODULE_SETTINGS> modulesSettings;

-    MODULE_SETTINGS storeModuleSettings;    
+    MODULE_SETTINGS storeModuleSettings;

     STG_LOGGER & logger;
 };
 //-----------------------------------------------------------------------------
     STG_LOGGER & logger;
 };
 //-----------------------------------------------------------------------------