Ticket. The time_t currentTime parameter added in TariffChangeIsAllow()

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

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 42f3541d1b90b7e68cfcf831af415d6732d84ef2..de27b72884a8a46d5a3bceca78503f5bac3923f5 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -42,7 +42,6 @@
 
 #include "stg/settings.h"
 #include "stg/common.h"
 
 #include "stg/settings.h"
 #include "stg/common.h"

-#include "stg/logger.h"

 #include "stg/module_settings.h"
 
 //-----------------------------------------------------------------------------
 #include "stg/module_settings.h"
 
 //-----------------------------------------------------------------------------


@@ -58,10 +57,11 @@ 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() {}

+    SETTINGS_IMPL & operator=(const SETTINGS_IMPL &);
+

     int Reload() { return ReadSettings(); }
     int ReadSettings();
 
     int Reload() { return ReadSettings(); }
     int ReadSettings();
 


@@ -84,6 +84,7 @@ public:
     bool                GetSpreadFee() const { return spreadFee; }
     bool                GetFreeMbAllowInet() const { return freeMbAllowInet; }
     bool                GetDayFeeIsLastDay() const { return dayFeeIsLastDay; }
     bool                GetSpreadFee() const { return spreadFee; }
     bool                GetFreeMbAllowInet() const { return freeMbAllowInet; }
     bool                GetDayFeeIsLastDay() const { return dayFeeIsLastDay; }

+    bool                GetStopOnError() const { return stopOnError; }

     bool                GetWriteFreeMbTraffCost() const
         { return writeFreeMbTraffCost; }
     bool                GetShowFeeInCash() const { return showFeeInCash; }
     bool                GetWriteFreeMbTraffCost() const
         { return writeFreeMbTraffCost; }
     bool                GetShowFeeInCash() const { return showFeeInCash; }


@@ -92,13 +93,14 @@ public:
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }
     unsigned            GetFeeChargeType() const { return feeChargeType; }
     bool                GetReconnectOnTariffChange() const { return reconnectOnTariffChange; }
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }
     unsigned            GetFeeChargeType() const { return feeChargeType; }
     bool                GetReconnectOnTariffChange() const { return reconnectOnTariffChange; }

+    bool                GetDisableSessionLog() const { return disableSessionLog; }
+    const std::vector<std::string> & GetFilterParamsLog() const { return filterParamsLog; }

 
     const std::string & GetModulesPath() const { return modulesPath; }
     const MODULE_SETTINGS & GetStoreModuleSettings() const
         { return storeModuleSettings; }
     const std::vector<MODULE_SETTINGS> & GetModulesSettings() const
         { return modulesSettings; }
 
     const std::string & GetModulesPath() const { return modulesPath; }
     const MODULE_SETTINGS & GetStoreModuleSettings() const
         { return storeModuleSettings; }
     const std::vector<MODULE_SETTINGS> & GetModulesSettings() const
         { return modulesSettings; }

-                

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


@@ -119,9 +121,7 @@ private:
     std::string logFile;
     std::string pidFile;
     std::string monitorDir;
     std::string logFile;
     std::string pidFile;
     std::string monitorDir;

-        

     std::vector<std::string> scriptParams;
     std::vector<std::string> scriptParams;

-    

     bool        monitoring;
     unsigned    detailStatWritePeriod;
     unsigned    statWritePeriod;
     bool        monitoring;
     unsigned    detailStatWritePeriod;
     unsigned    statWritePeriod;


@@ -133,15 +133,17 @@ private:
     bool        spreadFee;
     bool        freeMbAllowInet;
     bool        dayFeeIsLastDay;
     bool        spreadFee;
     bool        freeMbAllowInet;
     bool        dayFeeIsLastDay;

+    bool        stopOnError;

     bool        writeFreeMbTraffCost;
     bool        showFeeInCash;
     unsigned    messageTimeout;
     unsigned    feeChargeType;
     bool        reconnectOnTariffChange;
     bool        writeFreeMbTraffCost;
     bool        showFeeInCash;
     unsigned    messageTimeout;
     unsigned    feeChargeType;
     bool        reconnectOnTariffChange;

+    bool        disableSessionLog;
+    std::vector<std::string> filterParamsLog;

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

-    

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