password = "*_EMPTY_PASSWORD_*";
tariffName = NO_TARIFF_NAME;
connected = 0;
-traffStatInUse = 0;
-traffStat = &traffStatInternal[0];
tariff = tariffs->GetNoTariff();
ips = StrToIPS("*");
deleted = false;
return;
connected = 0;
-traffStatInUse = 0;
ipIndex = u.ipIndex;
deleted = u.deleted;
-traffStat = &traffStatInternal[traffStatInUse % 2];
-traffStatToWrite = &traffStatInternal[(traffStatInUse +1) % 2];
lastWriteStat = u.lastWriteStat;
lastWriteDeatiledStat = u.lastWriteDeatiledStat;
writeFreeMbTraffCost = settings->GetWriteFreeMbTraffCost();
+property.SetProperties(u.property);
+
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
int USER::ReadConf()
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-USER_CONF uc;
+USER_CONF conf;
-if (store->RestoreUserConf(&uc, login))
+if (store->RestoreUserConf(&conf, login))
{
WriteServLog("Cannot read conf for user %s.", login.c_str());
WriteServLog("%s", store->GetStrError().c_str());
return -1;
}
-password = uc.password;
-passive = uc.passive;
-disabled = uc.disabled;
-disabledDetailStat = uc.disabledDetailStat;
-alwaysOnline = uc.alwaysOnline;
-tariffName = uc.tariffName;
-address = uc.address;
-phone = uc.phone;
-email = uc.email;
-note = uc.note;
-realName = uc.realName;
-group = uc.group;
-credit = uc.credit;
-nextTariff = uc.nextTariff;
-userdata0 = uc.userdata[0];
-userdata1 = uc.userdata[1];
-userdata2 = uc.userdata[2];
-userdata3 = uc.userdata[3];
-userdata4 = uc.userdata[4];
-userdata5 = uc.userdata[5];
-userdata6 = uc.userdata[6];
-userdata7 = uc.userdata[7];
-userdata8 = uc.userdata[8];
-userdata9 = uc.userdata[9];
-
-creditExpire = uc.creditExpire;
-ips = uc.ips;
+property.SetConf(conf);
tariff = tariffs->FindByName(tariffName);
if (tariff == NULL)
int USER::ReadStat()
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-USER_STAT us;
+USER_STAT stat;
-if (store->RestoreUserStat(&us, login))
+if (store->RestoreUserStat(&stat, login))
{
WriteServLog("Cannot read stat for user %s.", login.c_str());
WriteServLog("%s", store->GetStrError().c_str());
return -1;
}
-up = us.up;
-down = us.down;
-cash = us.cash;
-freeMb = us.freeMb;
-lastCashAdd = us.lastCashAdd;
-lastCashAddTime = us.lastCashAddTime;
-passiveTime = us.passiveTime;
-lastActivityTime = us.lastActivityTime;
+property.SetStat(stat);
return 0;
}
int USER::WriteConf()
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-USER_CONF uc;
-
-uc.password = password;
-uc.passive = passive;
-uc.disabled = disabled;
-uc.disabledDetailStat = disabledDetailStat;
-uc.alwaysOnline = alwaysOnline;
-uc.tariffName = tariffName;
-uc.address = address;
-uc.phone = phone;
-uc.email = email;
-uc.note = note;
-uc.realName = realName;
-uc.group = group;
-uc.credit = credit;
-uc.nextTariff = nextTariff;
-uc.userdata[0] = userdata0;
-uc.userdata[1] = userdata1;
-uc.userdata[2] = userdata2;
-uc.userdata[3] = userdata3;
-uc.userdata[4] = userdata4;
-uc.userdata[5] = userdata5;
-uc.userdata[6] = userdata6;
-uc.userdata[7] = userdata7;
-uc.userdata[8] = userdata8;
-uc.userdata[9] = userdata9;
-
-uc.creditExpire = creditExpire;
-uc.ips = ips;
+USER_CONF conf(property.GetConf());
printfd(__FILE__, "USER::WriteConf()\n");
-if (store->SaveUserConf(uc, login))
+if (store->SaveUserConf(conf, login))
{
WriteServLog("Cannot write conf for user %s.", login.c_str());
WriteServLog("%s", store->GetStrError().c_str());
int USER::WriteStat()
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-USER_STAT us;
-
-us.up = up;
-us.down = down;
-us.cash = cash;
-us.freeMb = freeMb;
-us.lastCashAdd = lastCashAdd;
-us.lastCashAddTime = lastCashAddTime;
-us.passiveTime = passiveTime;
-us.lastActivityTime = lastActivityTime;
+USER_STAT stat(property.GetStat());
printfd(__FILE__, "USER::WriteStat()\n");
-if (store->SaveUserStat(us, login))
+if (store->SaveUserStat(stat, login))
{
WriteServLog("Cannot write stat for user %s.", login.c_str());
WriteServLog("%s", store->GetStrError().c_str());
int USER::WriteMonthStat()
{
STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-USER_STAT us;
-struct tm * t1;
time_t tt = stgTime - 3600;
-t1 = localtime(&tt);
-
-us.up = up;
-us.down = down;
-us.cash = cash;
-us.freeMb = freeMb;
-us.lastCashAdd = lastCashAdd;
-us.lastCashAddTime = lastCashAddTime;
-us.passiveTime = passiveTime;
-us.lastActivityTime = lastActivityTime;
-
-if (store->SaveMonthStat(us, t1->tm_mon, t1->tm_year, login))
+struct tm * t1 = localtime(&tt);
+
+USER_STAT stat(property.GetStat());
+if (store->SaveMonthStat(stat, t1->tm_mon, t1->tm_year, login))
{
WriteServLog("Cannot write month stat for user %s.", login.c_str());
WriteServLog("%s", store->GetStrError().c_str());
if (!fakeConnect)
lastIPForDisconnect = currIP;
-
-//printfd(__FILE__, "Connect. user name \'%s\' ip=%s\n", login.c_str(), inet_ntostring(currIP).c_str());
-/*if (settings->GetLogUserConnectDisconnect())
- WriteServLog("User \'%s\', %s: Connect.", login.c_str(), inet_ntostring(currIP).c_str());*/
}
//-----------------------------------------------------------------------------
void USER::Disconnect(bool fakeDisconnect, const std::string & reason)
WriteServLog("%s", store->GetStrError().c_str());
}
-//printfd(__FILE__, "Disconnect. User name \'%s\' ip=%s reason: '%s'\n", login.c_str(), inet_ntostring(lastIPForDisconnect).c_str(), reason.c_str());
-/*if (settings->GetLogUserConnectDisconnect())
- WriteServLog("User \'%s\', %s: Disconnect.", login.c_str(), inet_ntostring(lastIPForDisconnect).c_str());*/
-
if (!fakeDisconnect)
lastIPForDisconnect = 0;
#endif
map<IP_DIR_PAIR, STAT_NODE>::iterator lb;
-lb = traffStat->lower_bound(idp);
-if (lb == traffStat->end())
+lb = traffStat.lower_bound(idp);
+if (lb == traffStat.end() || lb->first != idp)
{
- traffStat->insert(lb,
- pair<IP_DIR_PAIR, STAT_NODE>(idp,
- STAT_NODE(len, 0, cost)));
+ traffStat.insert(lb,
+ pair<IP_DIR_PAIR, STAT_NODE>(idp,
+ STAT_NODE(len, 0, cost)));
}
else
- if (lb->first.dir == dir && lb->first.ip == ip)
- {
- lb->second.cash += cost;
- lb->second.up += len;
- }
- else
- {
- traffStat->insert(lb,
- pair<IP_DIR_PAIR, STAT_NODE>(idp,
- STAT_NODE(len, 0, cost)));
- }
+ {
+ lb->second.cash += cost;
+ lb->second.up += len;
+ }
}
//-----------------------------------------------------------------------------
#ifdef TRAFF_STAT_WITH_PORTS
#endif
map<IP_DIR_PAIR, STAT_NODE>::iterator lb;
-lb = traffStat->lower_bound(idp);
-if (lb == traffStat->end())
+lb = traffStat.lower_bound(idp);
+if (lb == traffStat.end() || lb->first != idp)
{
- traffStat->insert(lb,
- pair<IP_DIR_PAIR, STAT_NODE>(idp,
- STAT_NODE(0, len, cost)));
+ traffStat.insert(lb,
+ pair<IP_DIR_PAIR, STAT_NODE>(idp,
+ STAT_NODE(0, len, cost)));
}
else
- if (lb->first.dir == dir && lb->first.ip == ip)
- {
- lb->second.cash += cost;
- lb->second.down += len;
- }
- else
- {
- traffStat->insert(lb,
- pair<IP_DIR_PAIR, STAT_NODE>(idp,
- STAT_NODE(0, len, cost)));
- }
+ {
+ lb->second.cash += cost;
+ lb->second.down += len;
+ }
}
//-----------------------------------------------------------------------------
void USER::AddCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> * n)
Run();
}
//-----------------------------------------------------------------------------
-void USER::ResetDetailStat()
+int USER::WriteDetailStat(bool hard)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+printfd(__FILE__, "USER::WriteDetailedStat() - queue size = %d\n", traffStatQueue.size());
-traffStatToWrite->erase(traffStatToWrite->begin(), traffStatToWrite->end());
-}
-//-----------------------------------------------------------------------------
-int USER::WriteDetailStat()
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+if (!traffStatQueue.empty())
+ {
+ std::list<std::pair<time_t, TRAFF_STAT> >::iterator it;
+ for (it = traffStatQueue.begin(); it != traffStatQueue.end(); ++it)
+ {
+ if (store->WriteDetailedStat(it->second, it->first, login))
+ {
+ printfd(__FILE__, "USER::WriteDetailStat() - failed to write detail stat from queue\n");
+ WriteServLog("Cannot write detail stat from queue (of size %d recs) for user %s.", traffStatQueue.size(), login.c_str());
+ WriteServLog("%s", store->GetStrError().c_str());
+ return -1;
+ }
+ traffStatQueue.erase(it++);
+ }
+ }
+
+TRAFF_STAT ts;
+
+ {
+ STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+ ts.swap(traffStat);
+ }
-printfd(__FILE__, "USER::WriteDetailedStat(): size = %d\n", traffStatToWrite->size());
+printfd(__FILE__, "USER::WriteDetailedStat() - size = %d\n", ts.size());
-if (traffStatToWrite->size() && !disabledDetailStat)
+if (ts.size() && !disabledDetailStat)
{
- if (store->WriteDetailedStat(traffStatToWrite, lastWriteDeatiledStat, login))
+ if (store->WriteDetailedStat(ts, lastWriteDeatiledStat, login))
{
+ printfd(__FILE__, "USER::WriteDetailStat() - failed to write current detail stat\n");
WriteServLog("Cannot write detail stat for user %s.", login.c_str());
WriteServLog("%s", store->GetStrError().c_str());
+ if (!hard)
+ {
+ printfd(__FILE__, "USER::WriteDetailStat() - pushing detail stat to queue\n");
+ traffStatQueue.push_back(std::make_pair(lastWriteDeatiledStat, ts));
+ }
}
}
-lastWriteDeatiledStat = lastSwapDeatiledStat;
-return 0;
-}
-//-----------------------------------------------------------------------------
-int USER::SwapDetailStat()
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-
-lastSwapDeatiledStat = stgTime;
-traffStatToWrite = &traffStatInternal[traffStatInUse % 2];
-traffStat = &traffStatInternal[++traffStatInUse % 2];
-
+lastWriteDeatiledStat = stgTime;
return 0;
}
//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff