Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 68fb9b0de7defa2491da639a429f8384e8d0d0aa..1e6e2b0df6e0cf04b237e35986fdecef16484799 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -21,14 +21,14 @@
 #ifndef SETTINGS_IMPL_H
 #define SETTINGS_IMPL_H
 
-#include <string>
-#include <vector>
-
 #include "stg/settings.h"
 #include "stg/common.h"
 #include "stg/module_settings.h"
 #include "stg/ref.h"
 
+#include <string>
+#include <vector>
+
 //-----------------------------------------------------------------------------
 enum DETAIL_STAT_PERIOD {
     dsPeriod_1,
@@ -42,7 +42,7 @@ class DOTCONFDocumentNode;
 //-----------------------------------------------------------------------------
 class SETTINGS_IMPL : public SETTINGS {
 public:
-    SETTINGS_IMPL(const std::string &);
+    explicit SETTINGS_IMPL(const std::string &);
     SETTINGS_IMPL(const SETTINGS_IMPL & rhs);
     virtual ~SETTINGS_IMPL() {}
     SETTINGS_IMPL & operator=(const SETTINGS_IMPL &);
@@ -77,6 +77,8 @@ public:
     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
@@ -85,8 +87,6 @@ public:
         { return modulesSettings; }
     const std::vector<std::string> & GetScriptParams() const { return scriptParams; }
 
-    int ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector<PARAM_VALUE> * params);
-
 private:
 
     static void ErrorCallback(void * data, const char * buf);
@@ -119,6 +119,8 @@ private:
     unsigned    messageTimeout;
     unsigned    feeChargeType;
     bool        reconnectOnTariffChange;
+    bool        disableSessionLog;
+    std::vector<std::string> filterParamsLog;
 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;