X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/321b5c0630ef3b27469a008be31c9fcc131c2c8d..0b99486a23b690671632c665065cc17ac6d6ca2c:/projects/stargazer/settings_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp index 8af7f7aa..92670cb5 100644 --- a/projects/stargazer/settings_impl.cpp +++ b/projects/stargazer/settings_impl.cpp @@ -32,17 +32,24 @@ $Author: faust $ #include #include -#include "settings.h" -#include "stg_logger.h" -#include "dotconfpp.h" +#include "stg/logger.h" +#include "stg/dotconfpp.h" +#include "settings_impl.h" using namespace std; //----------------------------------------------------------------------------- -SETTINGS::SETTINGS() - : confDir("/etc/stargazer"), +SETTINGS_IMPL::SETTINGS_IMPL() + : SETTINGS(), + strError(), + modulesPath("/usr/lib/stg"), + dirName(DIR_NUM), + confDir("/etc/stargazer"), scriptsDir("/etc/stargazer"), + rules("/etc/stargazer/rules"), + logFile("/var/log/stargazer.log"), pidFile("/var/run/stargazer.pid"), + monitorDir("/var/stargazer/monitoring"), monitoring(false), detailStatWritePeriod(dsPeriod_1_6), statWritePeriod(10), @@ -57,13 +64,25 @@ SETTINGS::SETTINGS() writeFreeMbTraffCost(false), showFeeInCash(true), messageTimeout(0), + feeChargeType(0), + reconnectOnTariffChange(false), + modulesSettings(), + storeModuleSettings(), logger(GetStgLogger()) { } //----------------------------------------------------------------------------- -SETTINGS::SETTINGS(const std::string & cd) - : confDir(cd), +SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd) + : SETTINGS(), + strError(), + modulesPath("/usr/lib/stg"), + dirName(DIR_NUM), + confDir(cd), scriptsDir(cd), + rules(cd + "/rules"), + logFile("/var/log/stargazer.log"), + pidFile("/var/run/stargazer.pid"), + monitorDir("/var/stargazer/monitoring"), monitoring(false), detailStatWritePeriod(dsPeriod_1_6), statWritePeriod(10), @@ -78,102 +97,48 @@ SETTINGS::SETTINGS(const std::string & cd) writeFreeMbTraffCost(false), showFeeInCash(true), messageTimeout(0), + feeChargeType(0), + reconnectOnTariffChange(false), + modulesSettings(), + storeModuleSettings(), logger(GetStgLogger()) { } //----------------------------------------------------------------------------- -SETTINGS::SETTINGS(const SETTINGS & rval) - : confDir(rval.confDir), +SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval) + : SETTINGS(), + strError(), + modulesPath(rval.modulesPath), + dirName(rval.dirName), + confDir(rval.confDir), scriptsDir(rval.scriptsDir), + rules(rval.rules), + logFile(rval.logFile), pidFile(rval.pidFile), + monitorDir(rval.monitorDir), monitoring(rval.monitoring), - detailStatWritePeriod(dsPeriod_1_6), - statWritePeriod(10), + detailStatWritePeriod(rval.detailStatWritePeriod), + statWritePeriod(rval.statWritePeriod), stgExecMsgKey(rval.stgExecMsgKey), executersNum(rval.executersNum), fullFee(rval.fullFee), - dayFee(0), - dayResetTraff(0), + dayFee(rval.dayFee), + dayResetTraff(rval.dayResetTraff), spreadFee(rval.spreadFee), - freeMbAllowInet(false), - dayFeeIsLastDay(false), - writeFreeMbTraffCost(false), + freeMbAllowInet(rval.freeMbAllowInet), + dayFeeIsLastDay(rval.dayFeeIsLastDay), + writeFreeMbTraffCost(rval.writeFreeMbTraffCost), showFeeInCash(rval.showFeeInCash), messageTimeout(rval.messageTimeout), + feeChargeType(rval.feeChargeType), + reconnectOnTariffChange(rval.reconnectOnTariffChange), + modulesSettings(rval.modulesSettings), + storeModuleSettings(rval.storeModuleSettings), logger(GetStgLogger()) { } //----------------------------------------------------------------------------- -SETTINGS::~SETTINGS() -{ -} -//----------------------------------------------------------------------------- -int SETTINGS::ParseYesNo(const string & value, bool * val) -{ -if (0 == strcasecmp(value.c_str(), "yes")) - { - *val = true; - return 0; - } -if (0 == strcasecmp(value.c_str(), "no")) - { - *val = false; - return 0; - } - -strError = "Incorrect value \'" + value + "\'."; -return -1; -} -//----------------------------------------------------------------------------- -int SETTINGS::ParseInt(const string & value, int * val) -{ -if (str2x(value, *val)) - { - strError = "Cannot convert \'" + value + "\' to integer."; - return -1; - } -return 0; -} -//----------------------------------------------------------------------------- -int SETTINGS::ParseUnsigned(const string & value, unsigned * val) -{ -if (str2x(value, *val)) - { - strError = "Cannot convert \'" + value + "\' to unsigned integer."; - return -1; - } -return 0; -} -//----------------------------------------------------------------------------- -int SETTINGS::ParseIntInRange(const string & value, int min, int max, int * val) -{ -if (ParseInt(value, val) != 0) - return -1; - -if (*val < min || *val > max) - { - strError = "Value \'" + value + "\' out of range."; - return -1; - } - -return 0; -} -//----------------------------------------------------------------------------- -int SETTINGS::ParseUnsignedInRange(const string & value, unsigned min, unsigned max, unsigned * val) -{ -if (ParseUnsigned(value, val) != 0) - return -1; - -if (*val < min || *val > max) - { - strError = "Value \'" + value + "\' out of range."; - return -1; - } - -return 0; -} -//----------------------------------------------------------------------------- -int SETTINGS::ParseModuleSettings(const DOTCONFDocumentNode * node, vector * params) +int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, vector * params) { const DOTCONFDocumentNode * childNode; PARAM_VALUE pv; @@ -212,14 +177,14 @@ while (childNode) return 0; } //----------------------------------------------------------------------------- -void SETTINGS::ErrorCallback(void * data, const char * buf) +void SETTINGS_IMPL::ErrorCallback(void * data, const char * buf) { - printfd(__FILE__, buf); - SETTINGS * settings = static_cast(data); - settings->logger(buf); + printfd(__FILE__, "SETTINGS_IMPL::ErrorCallback() - %s\n", buf); + SETTINGS_IMPL * settings = static_cast(data); + settings->logger("%s", buf); } //----------------------------------------------------------------------------- -int SETTINGS::ReadSettings() +int SETTINGS_IMPL::ReadSettings() { const char * requiredOptions[] = { "ModulesPath", @@ -240,7 +205,7 @@ int storeModulesCount = 0; modulesSettings.clear(); DOTCONFDocument conf(DOTCONFDocument::CASEINSENSITIVE); -conf.setErrorCallback(SETTINGS::ErrorCallback, this); +conf.setErrorCallback(SETTINGS_IMPL::ErrorCallback, this); conf.setRequiredOptionNames(requiredOptions); string confFile = confDir + "/stargazer.conf"; @@ -408,12 +373,31 @@ while (node) } } + if (strcasecmp(node->getName(), "FeeChargeType") == 0) + { + if (ParseUnsignedInRange(node->getValue(0), 0, 3, &feeChargeType) != 0) + { + strError = "Incorrect FeeChargeType value: \'" + string(node->getValue(0)) + "\'"; + return -1; + } + } + + if (strcasecmp(node->getName(), "ReconnectOnTariffChange") == 0) + { + if (ParseYesNo(node->getValue(0), &reconnectOnTariffChange) != 0) + { + strError = "Incorrect ReconnectOnTariffChange value: \'" + string(node->getValue(0)) + "\'"; + return -1; + } + } + if (strcasecmp(node->getName(), "DirNames") == 0) { const DOTCONFDocumentNode * child = node->getChildNode(); if (child) { const DOTCONFDocumentNode * dirNameNode; + dirName.reserve(DIR_NUM); for (int i = 0; i < DIR_NUM; i++) { char strDirName[12]; @@ -473,13 +457,20 @@ while (node) } } + if (strcasecmp(node->getName(), "ScriptParams") == 0) + { + for (int i = 0; node->getValue(i) != NULL; ++i) + { + scriptParams.push_back(node->getValue(i)); + } + } node = node->getNextNode(); } return 0; } //----------------------------------------------------------------------------- -int SETTINGS::ParseDetailStatWritePeriod(const string & detailStatPeriodStr) +int SETTINGS_IMPL::ParseDetailStatWritePeriod(const string & detailStatPeriodStr) { if (detailStatPeriodStr == "1") { @@ -504,4 +495,4 @@ else if (detailStatPeriodStr == "1/6") return -1; } -//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- \ No newline at end of file