X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..f347aa92f1ff8fbf6335c5cc428e5bc9678a3a36:/projects/stargazer/settings.h diff --git a/projects/stargazer/settings.h b/projects/stargazer/settings.h index 46d40694..86262808 100644 --- a/projects/stargazer/settings.h +++ b/projects/stargazer/settings.h @@ -70,7 +70,7 @@ public: unsigned GetExecutersNum() const { return executersNum; } const std::string & GetDirName(int num) const { return dirName[num]; }; const std::string & GetConfDir() const { return confDir; } - const std::string & GetScriptDir() const { return scriptDir; } + const std::string & GetScriptsDir() const { return scriptsDir; } const std::string & GetRulesFileName() const { return rules; } const std::string & GetLogFileName() const { return logFile; } const std::string & GetPIDFileName() const { return pidFile; } @@ -91,7 +91,7 @@ public: unsigned GetMessageTimeout() const { return messageTimeout * 3600 * 24; } const std::string & GetModulesPath() const { return modulesPath; } - const MODULE_SETTINGS & GetStoreModuleSettings() const + const MODULE_SETTINGS & GetStoreModuleSettings() const { return storeModuleSettings; } const std::vector & GetModulesSettings() const { return modulesSettings; } @@ -110,11 +110,12 @@ private: static void ErrorCallback(void * data, const char * buf); std::string strError; + //////////settings std::string modulesPath; std::string dirName[DIR_NUM]; std::string confDir; - std::string scriptDir; + std::string scriptsDir; std::string rules; std::string logFile; std::string pidFile; @@ -125,14 +126,14 @@ private: int stgExecMsgKey; unsigned executersNum; bool fullFee; - unsigned dayFee; // ÄÅÎØ ÓÎÑÔÉÑ ÁÂÏÎÐÌÁÔÙ - unsigned dayResetTraff; // îÁÞÁÌÏ ÕÞÅÔÎÏÇÏ ÐÅÒÉÏÄÁ: ÄÅÎØ ÏÂÎÕÌÅÎÉÑ ÔÒÁÆÉËÁ É ÓÍÅÎÙ ÔÁÒÉÆÁ + unsigned dayFee; + unsigned dayResetTraff; bool spreadFee; bool freeMbAllowInet; - bool dayFeeIsLastDay; // áð ÓÎÉÍÁÅÔÓÑ × ËÏÎÃÅ ÍÅÓÑÃÁ (true) ÉÌÉ × ÎÁÞÁÌÅ (false) - bool writeFreeMbTraffCost; // ðÉÓÁÔØ × ÄÅÔÁÌØÎÕÀ ÓÔÁÔÉÓÔÉËÕ ÓÔÏÉÍÏÓÔØ ÔÒÁÆÉËÁ, ÅÓÌÉ ÅÝÅ ÅÓÔØ ÐÒÅÄÏÐÌÁÞÅÎÎÙÊ ÔÒÁÆÉË - bool showFeeInCash; // ðÏËÁÚÙ×ÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÀ áð ÎÅ ÓÞÅÔÕ É ÐÏÚ×ÏÌÑÔØ ÅÅ ÉÓÐÏÌØÚÏ×ÁÔØ - unsigned messageTimeout; // ÷ÒÅÍÑ ÖÉÚÎÉ ÎÅÏÔÐÒÁ×ÌÅÎÎÏÇÏ ÓÏÏÂÝÅÎÉÑ × ÓÅËÕÎÄÁÈ + bool dayFeeIsLastDay; + bool writeFreeMbTraffCost; + bool showFeeInCash; + unsigned messageTimeout; std::vector modulesSettings; MODULE_SETTINGS storeModuleSettings; @@ -140,4 +141,5 @@ private: STG_LOGGER & logger; }; //----------------------------------------------------------------------------- + #endif