X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/12aae76fbeaa3dc91ab5ecad5531a2c1925340d2..36f332ceb538480aeaed0dfa9917e983cac77389:/projects/stargazer/settings_impl.h?ds=inline diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h index b3e0f981..739bbcc9 100644 --- a/projects/stargazer/settings_impl.h +++ b/projects/stargazer/settings_impl.h @@ -40,17 +40,17 @@ #include #include -#include "settings.h" -#include "common.h" -#include "stg_logger.h" -#include "module_settings.h" +#include "stg/settings.h" +#include "stg/common.h" +#include "stg/logger.h" +#include "stg/module_settings.h" //----------------------------------------------------------------------------- enum DETAIL_STAT_PERIOD { dsPeriod_1, dsPeriod_1_2, dsPeriod_1_4, -dsPeriod_1_6, +dsPeriod_1_6 }; //----------------------------------------------------------------------------- class STG_LOGGER; @@ -90,6 +90,8 @@ public: const std::string & GetMonitorDir() const { return monitorDir; } 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 @@ -99,13 +101,7 @@ public: private: - int ParseInt(const std::string & value, int * val); - int ParseUnsigned(const std::string & value, unsigned * val); - int ParseIntInRange(const std::string & value, int min, int max, int * val); - int ParseUnsignedInRange(const std::string & value, unsigned min, unsigned max, unsigned * val); - int ParseYesNo(const std::string & value, bool * val); - int ParseDetailStatWritePeriod(const std::string & detailStatPeriodStr); - + int ParseDetailStatWritePeriod(const std::string & str); int ParseModuleSettings(const DOTCONFDocumentNode * dirNameNode, std::vector * params); static void ErrorCallback(void * data, const char * buf); @@ -114,7 +110,7 @@ private: //////////settings std::string modulesPath; - std::string dirName[DIR_NUM]; + std::vector dirName; std::string confDir; std::string scriptsDir; std::string rules; @@ -135,6 +131,8 @@ private: bool writeFreeMbTraffCost; bool showFeeInCash; unsigned messageTimeout; + unsigned feeChargeType; + bool reconnectOnTariffChange; std::vector modulesSettings; MODULE_SETTINGS storeModuleSettings;