Revert "Merge remote-tracking branch 'origin/master' into ticket37"

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

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 7dc742f52f42e0243bcd11e65bc800663e574b42..cc35393b2d18fab8d21cc705f3d1687fa031f43c 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();
 


@@ -92,12 +92,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
 
     const std::string & GetModulesPath() const { return modulesPath; }
     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 +119,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;


@@ -135,9 +137,11 @@ private:
     unsigned    messageTimeout;
     unsigned    feeChargeType;
     bool        reconnectOnTariffChange;
     unsigned    messageTimeout;
     unsigned    feeChargeType;
     bool        reconnectOnTariffChange;

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

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

-    MODULE_SETTINGS storeModuleSettings;    
+    MODULE_SETTINGS storeModuleSettings;

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