ReconnectOnTariffChange added to the settings

diff --git a/include/stg/settings.h b/include/stg/settings.h
index 16714be3803e9d747a2fce9398db53c1438219d5..e62f403b4c76abe54d654d1c3dfe4198c1bfe077 100644 (file)
--- a/include/stg/settings.h
+++ b/include/stg/settings.h
@@ -39,6 +39,7 @@ public:
     virtual bool                GetShowFeeInCash() const = 0;
     virtual unsigned            GetMessageTimeout() const = 0;
     virtual unsigned            GetFeeChargeType() const = 0;
     virtual bool                GetShowFeeInCash() const = 0;
     virtual unsigned            GetMessageTimeout() const = 0;
     virtual unsigned            GetFeeChargeType() const = 0;

+    virtual bool                GetReconnectOnTariffChange() const = 0;

     virtual const std::string & GetMonitorDir() const = 0;
     virtual bool                GetMonitoring() const = 0;
 };
     virtual const std::string & GetMonitorDir() const = 0;
     virtual bool                GetMonitoring() const = 0;
 };

diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf b/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf
index 55efa6ac4a7f0b0ad28fb1fbf029d5017f0b2ca4..49214fe857abfe0834e36d785138a67389949e16 100644 (file)
--- a/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf
+++ b/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf
@@ -87,7 +87,7 @@ WriteFreeMbTraffCost = yes
 # Parameter: optional
 # Values: yes, no
 # Default: no
 # Parameter: optional
 # Values: yes, no
 # Default: no

-FullFee = yes
+FullFee = no

 
 # Allow user to see and use a full cash (yes) or hide a part of it (no) 
 # for the next fee charge
 
 # Allow user to see and use a full cash (yes) or hide a part of it (no) 
 # for the next fee charge


@@ -165,6 +165,12 @@ ModulesPath = /usr/lib/stg
 # Default: 0 (classic)
 # FeeChargeType = 0
 
 # Default: 0 (classic)
 # FeeChargeType = 0
 

+# Enable or disable reconnect on tariff change
+# Parameter: optional
+# Values: yes, no
+# Default: no
+# ReconnectOnTariffChange = no
+

 ################################################################################
 # Store module
 # Configure the module that works with the database server
 ################################################################################
 # Store module
 # Configure the module that works with the database server

diff --git a/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf b/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf
index 55efa6ac4a7f0b0ad28fb1fbf029d5017f0b2ca4..49214fe857abfe0834e36d785138a67389949e16 100644 (file)
--- a/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf
+++ b/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf
@@ -87,7 +87,7 @@ WriteFreeMbTraffCost = yes
 # Parameter: optional
 # Values: yes, no
 # Default: no
 # Parameter: optional
 # Values: yes, no
 # Default: no

-FullFee = yes
+FullFee = no

 
 # Allow user to see and use a full cash (yes) or hide a part of it (no) 
 # for the next fee charge
 
 # Allow user to see and use a full cash (yes) or hide a part of it (no) 
 # for the next fee charge


@@ -165,6 +165,12 @@ ModulesPath = /usr/lib/stg
 # Default: 0 (classic)
 # FeeChargeType = 0
 
 # Default: 0 (classic)
 # FeeChargeType = 0
 

+# Enable or disable reconnect on tariff change
+# Parameter: optional
+# Values: yes, no
+# Default: no
+# ReconnectOnTariffChange = no
+

 ################################################################################
 # Store module
 # Configure the module that works with the database server
 ################################################################################
 # Store module
 # Configure the module that works with the database server

diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp
index 33b3e840c2ac7437de49bbe81b048848d2fdc768..f9135a1ae8f959b1a362ca85e22bc8b524406083 100644 (file)
--- a/projects/stargazer/settings_impl.cpp
+++ b/projects/stargazer/settings_impl.cpp
@@ -64,6 +64,7 @@ SETTINGS_IMPL::SETTINGS_IMPL()
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),

+      reconnectOnTariffChange(false),

       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())
       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())


@@ -95,6 +96,7 @@ SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),

+      reconnectOnTariffChange(false),

       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())
       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())


@@ -126,6 +128,7 @@ SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)
       showFeeInCash(rval.showFeeInCash),
       messageTimeout(rval.messageTimeout),
       feeChargeType(rval.feeChargeType),
       showFeeInCash(rval.showFeeInCash),
       messageTimeout(rval.messageTimeout),
       feeChargeType(rval.feeChargeType),

+      reconnectOnTariffChange(rval.reconnectOnTariffChange),

       modulesSettings(rval.modulesSettings),
       storeModuleSettings(rval.storeModuleSettings),
       logger(GetStgLogger())
       modulesSettings(rval.modulesSettings),
       storeModuleSettings(rval.storeModuleSettings),
       logger(GetStgLogger())


@@ -441,6 +444,15 @@ while (node)
             }
         }
 
             }
         }
 

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

     if (strcasecmp(node->getName(), "DirNames") == 0)
         {
         const DOTCONFDocumentNode * child = node->getChildNode();
     if (strcasecmp(node->getName(), "DirNames") == 0)
         {
         const DOTCONFDocumentNode * child = node->getChildNode();

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 97990d3243170d38cc974e7ade52ee3632e6a3bd..43dcab0ccccdb535fd2bd20ae2480d02122aeb1c 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -91,6 +91,7 @@ public:
     bool                GetMonitoring() const { return monitoring; }
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }
     unsigned            GetFeeChargeType() const { return feeChargeType; }
     bool                GetMonitoring() const { return monitoring; }
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }
     unsigned            GetFeeChargeType() const { return feeChargeType; }

+    bool                GetReconnectOnTariffChange() const { return reconnectOnTariffChange; }

 
     const std::string & GetModulesPath() const { return modulesPath; }
     const MODULE_SETTINGS & GetStoreModuleSettings() const
 
     const std::string & GetModulesPath() const { return modulesPath; }
     const MODULE_SETTINGS & GetStoreModuleSettings() const


@@ -137,6 +138,7 @@ private:
     bool        showFeeInCash;
     unsigned    messageTimeout;
     unsigned    feeChargeType;
     bool        showFeeInCash;
     unsigned    messageTimeout;
     unsigned    feeChargeType;

+    bool        reconnectOnTariffChange;

 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;
 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;