X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/02bcc3a0cfbd20bdbb474fc6c02057468d980276..65e7a8547ba44041cf6d0045b133e5263308cbd9:/projects/stargazer/settings_impl.h?ds=sidebyside diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h index 43dcab0c..b01e0fd1 100644 --- a/projects/stargazer/settings_impl.h +++ b/projects/stargazer/settings_impl.h @@ -50,7 +50,7 @@ enum DETAIL_STAT_PERIOD { dsPeriod_1, dsPeriod_1_2, dsPeriod_1_4, -dsPeriod_1_6, +dsPeriod_1_6 }; //----------------------------------------------------------------------------- class STG_LOGGER; @@ -58,7 +58,6 @@ class DOTCONFDocumentNode; //----------------------------------------------------------------------------- class SETTINGS_IMPL : public SETTINGS { public: - SETTINGS_IMPL(); SETTINGS_IMPL(const std::string &); SETTINGS_IMPL(const SETTINGS_IMPL &); virtual ~SETTINGS_IMPL() {} @@ -84,8 +83,9 @@ public: 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; }; + { return writeFreeMbTraffCost; } bool GetShowFeeInCash() const { return showFeeInCash; } const std::string & GetMonitorDir() const { return monitorDir; } bool GetMonitoring() const { return monitoring; } @@ -98,16 +98,11 @@ public: { return storeModuleSettings; } const std::vector & GetModulesSettings() const { return modulesSettings; } + const std::vector & GetScriptParams() const { return scriptParams; } 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); @@ -123,6 +118,7 @@ private: std::string logFile; std::string pidFile; std::string monitorDir; + std::vector scriptParams; bool monitoring; unsigned detailStatWritePeriod; unsigned statWritePeriod; @@ -134,6 +130,7 @@ private: bool spreadFee; bool freeMbAllowInet; bool dayFeeIsLastDay; + bool stopOnError; bool writeFreeMbTraffCost; bool showFeeInCash; unsigned messageTimeout; @@ -142,7 +139,6 @@ private: std::vector modulesSettings; MODULE_SETTINGS storeModuleSettings; - STG_LOGGER & logger; }; //-----------------------------------------------------------------------------