From d9bd555be1eccc4f615de667e3ff07650ef0f987 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Mon, 21 Mar 2011 12:54:04 +0200 Subject: [PATCH] SETTINGS removed from USER_PROPERT[Y | Y_LOGGED | IES] --- projects/stargazer/user_impl.cpp | 12 ++--- projects/stargazer/user_property.cpp | 72 ++++++++++++++-------------- projects/stargazer/user_property.h | 36 +++++--------- 3 files changed, 53 insertions(+), 67 deletions(-) diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index 6ef806f2..ed96ffc4 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -52,7 +52,7 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, const ADMIN * a, const USERS * u) : users(u), - property(s), + property(s->GetScriptsDir()), WriteServLog(GetStgLogger()), login(), id(0), @@ -132,7 +132,7 @@ pthread_mutex_init(&mutex, &attr); //----------------------------------------------------------------------------- USER_IMPL::USER_IMPL(const USER_IMPL & u) : users(u.users), - property(u.settings), + property(u.settings->GetScriptsDir()), WriteServLog(GetStgLogger()), login(u.login), id(u.id), @@ -458,7 +458,7 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__); if (!fakeConnect) { - string scriptOnConnect = settings->GetScriptDir() + "/OnConnect"; + string scriptOnConnect = settings->GetScriptsDir() + "/OnConnect"; if (access(scriptOnConnect.c_str(), X_OK) == 0) { @@ -515,7 +515,7 @@ if (!lastIPForDisconnect) if (!fakeDisconnect) { - string scriptOnDisonnect = settings->GetScriptDir() + "/OnDisconnect"; + string scriptOnDisonnect = settings->GetScriptsDir() + "/OnDisconnect"; if (access(scriptOnDisonnect.c_str(), X_OK) == 0) { @@ -911,7 +911,7 @@ void USER_IMPL::OnAdd() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -string scriptOnAdd = settings->GetScriptDir() + "/OnUserAdd"; +string scriptOnAdd = settings->GetScriptsDir() + "/OnUserAdd"; if (access(scriptOnAdd.c_str(), X_OK) == 0) { @@ -933,7 +933,7 @@ void USER_IMPL::OnDelete() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -string scriptOnDel = settings->GetScriptDir() + "/OnUserDel"; +string scriptOnDel = settings->GetScriptsDir() + "/OnUserDel"; if (access(scriptOnDel.c_str(), X_OK) == 0) { diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp index c1e202d7..1dd8b236 100644 --- a/projects/stargazer/user_property.cpp +++ b/projects/stargazer/user_property.cpp @@ -1,46 +1,44 @@ #include "user_property.h" //----------------------------------------------------------------------------- -USER_PROPERTIES::USER_PROPERTIES(const SETTINGS * s) +USER_PROPERTIES::USER_PROPERTIES(const std::string & sd) : -cash (stat.cash, "cash", false, true, GetStgLogger(), s), -up (stat.up, "upload", false, true, GetStgLogger(), s), -down (stat.down, "download", false, true, GetStgLogger(), s), -lastCashAdd (stat.lastCashAdd, "lastCashAdd", false, true, GetStgLogger(), s), -passiveTime (stat.passiveTime, "passiveTime", false, true, GetStgLogger(), s), -lastCashAddTime (stat.lastCashAddTime, "lastCashAddTime", false, true, GetStgLogger(), s), -freeMb (stat.freeMb, "freeMb", false, true, GetStgLogger(), s), -lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), s), +cash (stat.cash, "cash", false, true, GetStgLogger(), sd), +up (stat.up, "upload", false, true, GetStgLogger(), sd), +down (stat.down, "download", false, true, GetStgLogger(), sd), +lastCashAdd (stat.lastCashAdd, "lastCashAdd", false, true, GetStgLogger(), sd), +passiveTime (stat.passiveTime, "passiveTime", false, true, GetStgLogger(), sd), +lastCashAddTime (stat.lastCashAddTime, "lastCashAddTime", false, true, GetStgLogger(), sd), +freeMb (stat.freeMb, "freeMb", false, true, GetStgLogger(), sd), +lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), sd), -password (conf.password, "password", true, false, GetStgLogger(), s), -passive (conf.passive, "passive", false, false, GetStgLogger(), s), -disabled (conf.disabled, "disabled", false, false, GetStgLogger(), s), -disabledDetailStat(conf.disabledDetailStat,"DisabledDetailStat",false,false,GetStgLogger(), s), -alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), s), -tariffName (conf.tariffName, "tariff", false, false, GetStgLogger(), s), -nextTariff (conf.nextTariff, "new tariff", false, false, GetStgLogger(), s), -address (conf.address, "address", false, false, GetStgLogger(), s), -note (conf.note, "note", false, false, GetStgLogger(), s), -group (conf.group, "group", false, false, GetStgLogger(), s), -email (conf.email, "email", false, false, GetStgLogger(), s), -phone (conf.phone, "phone", false, false, GetStgLogger(), s), -realName (conf.realName, "realName", false, false, GetStgLogger(), s), -credit (conf.credit, "credit", false, false, GetStgLogger(), s), -creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), s), -ips (conf.ips, "IP", false, false, GetStgLogger(), s), -userdata0 (conf.userdata[0], "userdata0", false, false, GetStgLogger(), s), -userdata1 (conf.userdata[1], "userdata1", false, false, GetStgLogger(), s), -userdata2 (conf.userdata[2], "userdata2", false, false, GetStgLogger(), s), -userdata3 (conf.userdata[3], "userdata3", false, false, GetStgLogger(), s), -userdata4 (conf.userdata[4], "userdata4", false, false, GetStgLogger(), s), -userdata5 (conf.userdata[5], "userdata5", false, false, GetStgLogger(), s), -userdata6 (conf.userdata[6], "userdata6", false, false, GetStgLogger(), s), -userdata7 (conf.userdata[7], "userdata7", false, false, GetStgLogger(), s), -userdata8 (conf.userdata[8], "userdata8", false, false, GetStgLogger(), s), -userdata9 (conf.userdata[9], "userdata9", false, false, GetStgLogger(), s) +password (conf.password, "password", true, false, GetStgLogger(), sd), +passive (conf.passive, "passive", false, false, GetStgLogger(), sd), +disabled (conf.disabled, "disabled", false, false, GetStgLogger(), sd), +disabledDetailStat(conf.disabledDetailStat,"DisabledDetailStat",false,false,GetStgLogger(), sd), +alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd), +tariffName (conf.tariffName, "tariff", false, false, GetStgLogger(), sd), +nextTariff (conf.nextTariff, "new tariff", false, false, GetStgLogger(), sd), +address (conf.address, "address", false, false, GetStgLogger(), sd), +note (conf.note, "note", false, false, GetStgLogger(), sd), +group (conf.group, "group", false, false, GetStgLogger(), sd), +email (conf.email, "email", false, false, GetStgLogger(), sd), +phone (conf.phone, "phone", false, false, GetStgLogger(), sd), +realName (conf.realName, "realName", false, false, GetStgLogger(), sd), +credit (conf.credit, "credit", false, false, GetStgLogger(), sd), +creditExpire(conf.creditExpire, "creditExpire", false, false, GetStgLogger(), sd), +ips (conf.ips, "IP", false, false, GetStgLogger(), sd), +userdata0 (conf.userdata[0], "userdata0", false, false, GetStgLogger(), sd), +userdata1 (conf.userdata[1], "userdata1", false, false, GetStgLogger(), sd), +userdata2 (conf.userdata[2], "userdata2", false, false, GetStgLogger(), sd), +userdata3 (conf.userdata[3], "userdata3", false, false, GetStgLogger(), sd), +userdata4 (conf.userdata[4], "userdata4", false, false, GetStgLogger(), sd), +userdata5 (conf.userdata[5], "userdata5", false, false, GetStgLogger(), sd), +userdata6 (conf.userdata[6], "userdata6", false, false, GetStgLogger(), sd), +userdata7 (conf.userdata[7], "userdata7", false, false, GetStgLogger(), sd), +userdata8 (conf.userdata[8], "userdata8", false, false, GetStgLogger(), sd), +userdata9 (conf.userdata[9], "userdata9", false, false, GetStgLogger(), sd) { - } //----------------------------------------------------------------------------- - diff --git a/projects/stargazer/user_property.h b/projects/stargazer/user_property.h index c7019216..41a0cfb5 100644 --- a/projects/stargazer/user_property.h +++ b/projects/stargazer/user_property.h @@ -70,7 +70,7 @@ public: bool isPassword, bool isStat, STG_LOGGER & logger, - const SETTINGS * s); + const std::string & sd); virtual ~USER_PROPERTY_LOGGED(); USER_PROPERTY_LOGGED * GetPointer() throw(); @@ -100,12 +100,11 @@ private: const string & newValue, const ADMIN * admin); - string name; // parameter name. needed for logging + STG_LOGGER & stgLogger; // server's logger bool isPassword; // is parameter password. when true, it will be logged as ******* bool isStat; // is parameter a stat data or conf data? - mutable pthread_mutex_t mutex; - STG_LOGGER & stgLogger; // server's logger - const SETTINGS * settings; + string name; // parameter name. needed for logging + const std::string scriptsDir; }; //----------------------------------------------------------------------------- class USER_PROPERTIES { @@ -122,7 +121,7 @@ private: USER_CONF conf; public: - USER_PROPERTIES(const SETTINGS * settings); + USER_PROPERTIES(const std::string & sd); USER_STAT & Stat() { return stat; } USER_CONF & Conf() { return conf; } @@ -283,17 +282,15 @@ USER_PROPERTY_LOGGED::USER_PROPERTY_LOGGED(varT& val, bool isPass, bool isSt, STG_LOGGER & logger, - const SETTINGS * s) + const std::string & sd) : USER_PROPERTY(val), - stgLogger(logger) + stgLogger(logger), + isPassword(isPass), + isStat(isSt), + name(n), + scriptsDir(sd) { -pthread_mutex_init(&mutex, NULL); -STG_LOCKER locker(&mutex, __FILE__, __LINE__); -isPassword = isPass; -isStat = isSt; -name = n; -settings = s; } //----------------------------------------------------------------------------- template @@ -326,8 +323,6 @@ bool USER_PROPERTY_LOGGED::Set(const varT & val, const STORE * store, const string & msg) { -STG_LOCKER locker(&mutex, __FILE__, __LINE__); - const PRIV * priv = admin->GetPriv(); string adm_login = admin->GetLogin(); string adm_ip = admin->GetIPStr(); @@ -402,7 +397,7 @@ void USER_PROPERTY_LOGGED::OnChange(const string & login, { string str1; -str1 = settings->GetConfDir() + "/OnChange"; +str1 = scriptsDir + "/OnChange"; if (access(str1.c_str(), X_OK) == 0) { @@ -417,13 +412,6 @@ else //------------------------------------------------------------------------- //------------------------------------------------------------------------- //------------------------------------------------------------------------- -/*template -stringstream & operator<< (stringstream & s, const USER_PROPERTY & v) -{ -s << v.ConstData(); -return s; -}*/ -//----------------------------------------------------------------------------- template ostream & operator<< (ostream & stream, const USER_PROPERTY & value) { -- 2.44.2