git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added modification time for session traffic.
[stg.git]
/
projects
/
stargazer
/
plugins
/
store
/
files
/
file_store.cpp
diff --git
a/projects/stargazer/plugins/store/files/file_store.cpp
b/projects/stargazer/plugins/store/files/file_store.cpp
index 0f55b5300adcc4357eeb6ce95748c130833c7255..9d66e352f12faed6e2f680d689a356c018855f8c 100644
(file)
--- a/
projects/stargazer/plugins/store/files/file_store.cpp
+++ b/
projects/stargazer/plugins/store/files/file_store.cpp
@@
-358,7
+358,7
@@
int FILES_STORE::ParseSettings()
int ret = storeSettings.ParseSettings(settings);
if (ret)
{
int ret = storeSettings.ParseSettings(settings);
if (ret)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = storeSettings.GetStrError();
}
return ret;
errorStr = storeSettings.GetStrError();
}
return ret;
@@
-370,12
+370,12
@@
std::vector<std::string> files;
if (GetFileList(&files, storeSettings.GetUsersDir(), S_IFDIR, ""))
{
if (GetFileList(&files, storeSettings.GetUsersDir(), S_IFDIR, ""))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Failed to open '" + storeSettings.GetUsersDir() + "': " + std::string(strerror(errno));
return -1;
}
errorStr = "Failed to open '" + storeSettings.GetUsersDir() + "': " + std::string(strerror(errno));
return -1;
}
-STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+STG_LOCKER lock(&mutex);
userList->swap(files);
userList->swap(files);
@@
-388,12
+388,12
@@
std::vector<std::string> files;
if (GetFileList(&files, storeSettings.GetAdminsDir(), S_IFREG, ".adm"))
{
if (GetFileList(&files, storeSettings.GetAdminsDir(), S_IFREG, ".adm"))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Failed to open '" + storeSettings.GetAdminsDir() + "': " + std::string(strerror(errno));
return -1;
}
errorStr = "Failed to open '" + storeSettings.GetAdminsDir() + "': " + std::string(strerror(errno));
return -1;
}
-STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+STG_LOCKER lock(&mutex);
adminList->swap(files);
adminList->swap(files);
@@
-406,12
+406,12
@@
std::vector<std::string> files;
if (GetFileList(&files, storeSettings.GetTariffsDir(), S_IFREG, ".tf"))
{
if (GetFileList(&files, storeSettings.GetTariffsDir(), S_IFREG, ".tf"))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Failed to open '" + storeSettings.GetTariffsDir() + "': " + std::string(strerror(errno));
return -1;
}
errorStr = "Failed to open '" + storeSettings.GetTariffsDir() + "': " + std::string(strerror(errno));
return -1;
}
-STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+STG_LOCKER lock(&mutex);
tariffList->swap(files);
tariffList->swap(files);
@@
-448,7
+448,7
@@
while ((entry = readdir(d)))
{
if (unlink(str.c_str()))
{
{
if (unlink(str.c_str()))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "unlink failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
errorStr = "unlink failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
@@
-473,7
+473,7
@@
closedir(d);
if (rmdir(path))
{
if (rmdir(path))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "rmdir failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
errorStr = "rmdir failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
@@
-492,7
+492,7
@@
strprintf(&fileName, "%s%s", storeSettings.GetUsersDir().c_str(), login.c_str())
if (mkdir(fileName.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1)
{
if (mkdir(fileName.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("mkdir failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::AddUser - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = std::string("mkdir failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::AddUser - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-501,7
+501,7
@@
if (mkdir(fileName.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) ==
strprintf(&fileName, "%s%s/conf", storeSettings.GetUsersDir().c_str(), login.c_str());
if (Touch(fileName))
{
strprintf(&fileName, "%s%s/conf", storeSettings.GetUsersDir().c_str(), login.c_str());
if (Touch(fileName))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot create file \"" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::AddUser - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "Cannot create file \"" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::AddUser - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-510,7
+510,7
@@
if (Touch(fileName))
strprintf(&fileName, "%s%s/stat", storeSettings.GetUsersDir().c_str(), login.c_str());
if (Touch(fileName))
{
strprintf(&fileName, "%s%s/stat", storeSettings.GetUsersDir().c_str(), login.c_str());
if (Touch(fileName))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot create file \"" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::AddUser - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "Cannot create file \"" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::AddUser - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-528,7
+528,7
@@
if (access(dirName.c_str(), F_OK) != 0)
{
if (mkdir(dirName.c_str(), 0700) != 0)
{
{
if (mkdir(dirName.c_str(), 0700) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Directory '" + dirName + "' cannot be created.";
printfd(__FILE__, "FILES_STORE::DelUser - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "Directory '" + dirName + "' cannot be created.";
printfd(__FILE__, "FILES_STORE::DelUser - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-541,7
+541,7
@@
if (access(dirName.c_str(), F_OK) == 0)
strprintf(&dirName1, "%s/%s", storeSettings.GetUsersDir().c_str(), login.c_str());
if (rename(dirName1.c_str(), dirName.c_str()))
{
strprintf(&dirName1, "%s/%s", storeSettings.GetUsersDir().c_str(), login.c_str());
if (rename(dirName1.c_str(), dirName.c_str()))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error moving dir from " + dirName1 + " to " + dirName;
printfd(__FILE__, "FILES_STORE::DelUser - rename failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "Error moving dir from " + dirName1 + " to " + dirName;
printfd(__FILE__, "FILES_STORE::DelUser - rename failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-577,11
+577,10
@@
int FILES_STORE::RestoreUserConf(USER_CONF * conf, const std::string & login, co
{
CONFIGFILE cf(fileName);
int e = cf.Error();
{
CONFIGFILE cf(fileName);
int e = cf.Error();
-std::string str;
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - conf read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' data not read.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - conf read failed for user '%s'\n", login.c_str());
return -1;
@@
-589,14
+588,14
@@
if (e)
if (cf.ReadString("Password", &conf->password, "") < 0)
{
if (cf.ReadString("Password", &conf->password, "") < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read. Parameter Password.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - password read failed for user '%s'\n", login.c_str());
return -1;
}
if (conf->password.empty())
{
errorStr = "User \'" + login + "\' data not read. Parameter Password.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - password read failed for user '%s'\n", login.c_str());
return -1;
}
if (conf->password.empty())
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' password is blank.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - password is blank for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' password is blank.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - password is blank for user '%s'\n", login.c_str());
return -1;
@@
-604,14
+603,14
@@
if (conf->password.empty())
if (cf.ReadString("tariff", &conf->tariffName, "") < 0)
{
if (cf.ReadString("tariff", &conf->tariffName, "") < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read. Parameter Tariff.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - tariff read failed for user '%s'\n", login.c_str());
return -1;
}
if (conf->tariffName.empty())
{
errorStr = "User \'" + login + "\' data not read. Parameter Tariff.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - tariff read failed for user '%s'\n", login.c_str());
return -1;
}
if (conf->tariffName.empty())
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' tariff is blank.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - tariff is blank for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' tariff is blank.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - tariff is blank for user '%s'\n", login.c_str());
return -1;
@@
-626,7
+625,7
@@
try
}
catch (const std::string & s)
{
}
catch (const std::string & s)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read. Parameter IP address. " + s;
printfd(__FILE__, "FILES_STORE::RestoreUserConf - ip read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' data not read. Parameter IP address. " + s;
printfd(__FILE__, "FILES_STORE::RestoreUserConf - ip read failed for user '%s'\n", login.c_str());
return -1;
@@
-635,7
+634,7
@@
conf->ips = ips;
if (cf.ReadInt("alwaysOnline", &conf->alwaysOnline, 0) != 0)
{
if (cf.ReadInt("alwaysOnline", &conf->alwaysOnline, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read. Parameter AlwaysOnline.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - alwaysonline read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' data not read. Parameter AlwaysOnline.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - alwaysonline read failed for user '%s'\n", login.c_str());
return -1;
@@
-643,7
+642,7
@@
if (cf.ReadInt("alwaysOnline", &conf->alwaysOnline, 0) != 0)
if (cf.ReadInt("down", &conf->disabled, 0) != 0)
{
if (cf.ReadInt("down", &conf->disabled, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read. Parameter Down.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - down read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' data not read. Parameter Down.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - down read failed for user '%s'\n", login.c_str());
return -1;
@@
-651,7
+650,7
@@
if (cf.ReadInt("down", &conf->disabled, 0) != 0)
if (cf.ReadInt("passive", &conf->passive, 0) != 0)
{
if (cf.ReadInt("passive", &conf->passive, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read. Parameter Passive.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - passive read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' data not read. Parameter Passive.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - passive read failed for user '%s'\n", login.c_str());
return -1;
@@
-676,7
+675,7
@@
for (int i = 0; i < USERDATA_NUM; i++)
if (cf.ReadDouble("Credit", &conf->credit, 0) != 0)
{
if (cf.ReadDouble("Credit", &conf->credit, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' data not read. Parameter Credit.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - credit read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' data not read. Parameter Credit.";
printfd(__FILE__, "FILES_STORE::RestoreUserConf - credit read failed for user '%s'\n", login.c_str());
return -1;
@@
-709,7
+708,7
@@
int e = cf.Error();
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Cannot open file " + fileName + ".";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - stat read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Cannot open file " + fileName + ".";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - stat read failed for user '%s'\n", login.c_str());
return -1;
@@
-723,7
+722,7
@@
for (int i = 0; i < DIR_NUM; i++)
snprintf(s, 22, "D%d", i);
if (cf.ReadULongLongInt(s, &traff, 0) != 0)
{
snprintf(s, 22, "D%d", i);
if (cf.ReadULongLongInt(s, &traff, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter " + std::string(s);
printfd(__FILE__, "FILES_STORE::RestoreUserStat - download stat read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter " + std::string(s);
printfd(__FILE__, "FILES_STORE::RestoreUserStat - download stat read failed for user '%s'\n", login.c_str());
return -1;
@@
-733,7
+732,7
@@
for (int i = 0; i < DIR_NUM; i++)
snprintf(s, 22, "U%d", i);
if (cf.ReadULongLongInt(s, &traff, 0) != 0)
{
snprintf(s, 22, "U%d", i);
if (cf.ReadULongLongInt(s, &traff, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter " + std::string(s);
printfd(__FILE__, "FILES_STORE::RestoreUserStat - upload stat read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter " + std::string(s);
printfd(__FILE__, "FILES_STORE::RestoreUserStat - upload stat read failed for user '%s'\n", login.c_str());
return -1;
@@
-743,7
+742,7
@@
for (int i = 0; i < DIR_NUM; i++)
if (cf.ReadDouble("Cash", &stat->cash, 0) != 0)
{
if (cf.ReadDouble("Cash", &stat->cash, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter Cash";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - cash read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter Cash";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - cash read failed for user '%s'\n", login.c_str());
return -1;
@@
-751,7
+750,7
@@
if (cf.ReadDouble("Cash", &stat->cash, 0) != 0)
if (cf.ReadDouble("FreeMb", &stat->freeMb, 0) != 0)
{
if (cf.ReadDouble("FreeMb", &stat->freeMb, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter FreeMb";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - freemb read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter FreeMb";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - freemb read failed for user '%s'\n", login.c_str());
return -1;
@@
-759,7
+758,7
@@
if (cf.ReadDouble("FreeMb", &stat->freeMb, 0) != 0)
if (cf.ReadTime("LastCashAddTime", &stat->lastCashAddTime, 0) != 0)
{
if (cf.ReadTime("LastCashAddTime", &stat->lastCashAddTime, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter LastCashAddTime";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - lastcashaddtime read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter LastCashAddTime";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - lastcashaddtime read failed for user '%s'\n", login.c_str());
return -1;
@@
-767,7
+766,7
@@
if (cf.ReadTime("LastCashAddTime", &stat->lastCashAddTime, 0) != 0)
if (cf.ReadTime("PassiveTime", &stat->passiveTime, 0) != 0)
{
if (cf.ReadTime("PassiveTime", &stat->passiveTime, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter PassiveTime";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - passivetime read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter PassiveTime";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - passivetime read failed for user '%s'\n", login.c_str());
return -1;
@@
-775,7
+774,7
@@
if (cf.ReadTime("PassiveTime", &stat->passiveTime, 0) != 0)
if (cf.ReadDouble("LastCashAdd", &stat->lastCashAdd, 0) != 0)
{
if (cf.ReadDouble("LastCashAdd", &stat->lastCashAdd, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter LastCashAdd";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - lastcashadd read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter LastCashAdd";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - lastcashadd read failed for user '%s'\n", login.c_str());
return -1;
@@
-783,7
+782,7
@@
if (cf.ReadDouble("LastCashAdd", &stat->lastCashAdd, 0) != 0)
if (cf.ReadTime("LastActivityTime", &stat->lastActivityTime, 0) != 0)
{
if (cf.ReadTime("LastActivityTime", &stat->lastActivityTime, 0) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "User \'" + login + "\' stat not read. Parameter LastActivityTime";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - lastactivitytime read failed for user '%s'\n", login.c_str());
return -1;
errorStr = "User \'" + login + "\' stat not read. Parameter LastActivityTime";
printfd(__FILE__, "FILES_STORE::RestoreUserStat - lastactivitytime read failed for user '%s'\n", login.c_str());
return -1;
@@
-803,7
+802,7
@@
int e = cfstat.Error();
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("User \'") + login + "\' conf not written\n";
printfd(__FILE__, "FILES_STORE::SaveUserConf - conf write failed for user '%s'\n", login.c_str());
return -1;
errorStr = std::string("User \'") + login + "\' conf not written\n";
printfd(__FILE__, "FILES_STORE::SaveUserConf - conf write failed for user '%s'\n", login.c_str());
return -1;
@@
-814,7
+813,7
@@
e += chown(fileName.c_str(), storeSettings.GetConfUID(), storeSettings.GetConfGI
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::SaveUserConf - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::SaveUserConf - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-850,7
+849,6
@@
return 0;
//-----------------------------------------------------------------------------
int FILES_STORE::SaveUserStat(const USER_STAT & stat, const std::string & login) const
{
//-----------------------------------------------------------------------------
int FILES_STORE::SaveUserStat(const USER_STAT & stat, const std::string & login) const
{
-char s[22];
std::string fileName;
fileName = storeSettings.GetUsersDir() + "/" + login + "/stat";
std::string fileName;
fileName = storeSettings.GetUsersDir() + "/" + login + "/stat";
@@
-860,7
+858,7
@@
fileName = storeSettings.GetUsersDir() + "/" + login + "/stat";
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("User \'") + login + "\' stat not written\n";
printfd(__FILE__, "FILES_STORE::SaveUserStat - stat write failed for user '%s'\n", login.c_str());
return -1;
errorStr = std::string("User \'") + login + "\' stat not written\n";
printfd(__FILE__, "FILES_STORE::SaveUserStat - stat write failed for user '%s'\n", login.c_str());
return -1;
@@
-868,6
+866,7
@@
fileName = storeSettings.GetUsersDir() + "/" + login + "/stat";
for (int i = 0; i < DIR_NUM; i++)
{
for (int i = 0; i < DIR_NUM; i++)
{
+ char s[22];
snprintf(s, 22, "D%d", i);
cfstat.WriteInt(s, stat.monthDown[i]);
snprintf(s, 22, "U%d", i);
snprintf(s, 22, "D%d", i);
cfstat.WriteInt(s, stat.monthDown[i]);
snprintf(s, 22, "U%d", i);
@@
-887,7
+886,7
@@
e += chown(fileName.c_str(), storeSettings.GetStatUID(), storeSettings.GetStatGI
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::SaveUserStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::SaveUserStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-912,7
+911,7
@@
if (f)
}
else
{
}
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot open \'" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::WriteLogString - log write failed for user '%s'\n", login.c_str());
return -1;
errorStr = "Cannot open \'" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::WriteLogString - log write failed for user '%s'\n", login.c_str());
return -1;
@@
-923,7
+922,7
@@
e += chown(fileName.c_str(), storeSettings.GetLogUID(), storeSettings.GetLogGID(
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::WriteLogString - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::WriteLogString - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-948,7
+947,7
@@
if (f)
}
else
{
}
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot open \'" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::WriteLogString - log write failed for user '%s'\n", login.c_str());
return -1;
errorStr = "Cannot open \'" + fileName + "\'";
printfd(__FILE__, "FILES_STORE::WriteLogString - log write failed for user '%s'\n", login.c_str());
return -1;
@@
-959,7
+958,7
@@
e += chown(fileName.c_str(), storeSettings.GetLogUID(), storeSettings.GetLogGID(
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::WriteLogString - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::WriteLogString - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-1036,7
+1035,7
@@
CONFIGFILE s(stat1, true);
if (s.Error())
{
if (s.Error())
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot create file '" + stat1 + "'";
printfd(__FILE__, "FILES_STORE::SaveMonthStat - month stat write failed for user '%s'\n", login.c_str());
return -1;
errorStr = "Cannot create file '" + stat1 + "'";
printfd(__FILE__, "FILES_STORE::SaveMonthStat - month stat write failed for user '%s'\n", login.c_str());
return -1;
@@
-1051,7
+1050,7
@@
CONFIGFILE s2(stat2, true);
if (s2.Error())
{
if (s2.Error())
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot create file '" + stat2 + "'";
printfd(__FILE__, "FILES_STORE::SaveMonthStat - month stat write failed for user '%s'\n", login.c_str());
return -1;
errorStr = "Cannot create file '" + stat2 + "'";
printfd(__FILE__, "FILES_STORE::SaveMonthStat - month stat write failed for user '%s'\n", login.c_str());
return -1;
@@
-1089,7
+1088,7
@@
strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), login.c_
if (Touch(fileName))
{
if (Touch(fileName))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot create file " + fileName;
printfd(__FILE__, "FILES_STORE::AddAdmin - failed to add admin '%s'\n", login.c_str());
return -1;
errorStr = "Cannot create file " + fileName;
printfd(__FILE__, "FILES_STORE::AddAdmin - failed to add admin '%s'\n", login.c_str());
return -1;
@@
-1104,7
+1103,7
@@
std::string fileName;
strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), login.c_str());
if (unlink(fileName.c_str()))
{
strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), login.c_str());
if (unlink(fileName.c_str()))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "unlink failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
errorStr = "unlink failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
@@
-1115,10
+1114,6
@@
return 0;
//-----------------------------------------------------------------------------*/
int FILES_STORE::SaveAdmin(const ADMIN_CONF & ac) const
{
//-----------------------------------------------------------------------------*/
int FILES_STORE::SaveAdmin(const ADMIN_CONF & ac) const
{
-char passwordE[2 * ADM_PASSWD_LEN + 2];
-char pass[ADM_PASSWD_LEN + 1];
-char adminPass[ADM_PASSWD_LEN + 1];
-
std::string fileName;
strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), ac.login.c_str());
std::string fileName;
strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), ac.login.c_str());
@@
-1130,13
+1125,16
@@
strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), ac.login
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot write admin " + ac.login + ". " + fileName;
printfd(__FILE__, "FILES_STORE::SaveAdmin - failed to save admin '%s'\n", ac.login.c_str());
return -1;
}
errorStr = "Cannot write admin " + ac.login + ". " + fileName;
printfd(__FILE__, "FILES_STORE::SaveAdmin - failed to save admin '%s'\n", ac.login.c_str());
return -1;
}
+ char pass[ADM_PASSWD_LEN + 1];
memset(pass, 0, sizeof(pass));
memset(pass, 0, sizeof(pass));
+
+ char adminPass[ADM_PASSWD_LEN + 1];
memset(adminPass, 0, sizeof(adminPass));
BLOWFISH_CTX ctx;
memset(adminPass, 0, sizeof(adminPass));
BLOWFISH_CTX ctx;
@@
-1151,6
+1149,7
@@
strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), ac.login
}
pass[ADM_PASSWD_LEN - 1] = 0;
}
pass[ADM_PASSWD_LEN - 1] = 0;
+ char passwordE[2 * ADM_PASSWD_LEN + 2];
Encode12(passwordE, pass, ADM_PASSWD_LEN);
cf.WriteString("password", passwordE);
Encode12(passwordE, pass, ADM_PASSWD_LEN);
cf.WriteString("password", passwordE);
@@
-1182,7
+1181,7
@@
std::string p;
if (cf.Error())
{
if (cf.Error())
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot open " + fileName;
printfd(__FILE__, "FILES_STORE::RestoreAdmin - failed to restore admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Cannot open " + fileName;
printfd(__FILE__, "FILES_STORE::RestoreAdmin - failed to restore admin '%s'\n", ac->login.c_str());
return -1;
@@
-1190,7
+1189,7
@@
if (cf.Error())
if (cf.ReadString("password", &p, "*"))
{
if (cf.ReadString("password", &p, "*"))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter password";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - password read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter password";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - password read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1224,7
+1223,7
@@
if (cf.ReadUShortInt("ChgConf", &a, 0) == 0)
ac->priv.userConf = a;
else
{
ac->priv.userConf = a;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter ChgConf";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgconf read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter ChgConf";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgconf read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1234,7
+1233,7
@@
if (cf.ReadUShortInt("ChgPassword", &a, 0) == 0)
ac->priv.userPasswd = a;
else
{
ac->priv.userPasswd = a;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter ChgPassword";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgpassword read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter ChgPassword";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgpassword read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1244,7
+1243,7
@@
if (cf.ReadUShortInt("ChgStat", &a, 0) == 0)
ac->priv.userStat = a;
else
{
ac->priv.userStat = a;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter ChgStat";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgstat read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter ChgStat";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgstat read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1254,7
+1253,7
@@
if (cf.ReadUShortInt("ChgCash", &a, 0) == 0)
ac->priv.userCash = a;
else
{
ac->priv.userCash = a;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter ChgCash";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgcash read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter ChgCash";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgcash read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1264,7
+1263,7
@@
if (cf.ReadUShortInt("UsrAddDel", &a, 0) == 0)
ac->priv.userAddDel = a;
else
{
ac->priv.userAddDel = a;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter UsrAddDel";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - usradddel read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter UsrAddDel";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - usradddel read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1274,7
+1273,7
@@
if (cf.ReadUShortInt("ChgAdmin", &a, 0) == 0)
ac->priv.adminChg = a;
else
{
ac->priv.adminChg = a;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter ChgAdmin";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgadmin read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter ChgAdmin";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgadmin read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1284,7
+1283,7
@@
if (cf.ReadUShortInt("ChgTariff", &a, 0) == 0)
ac->priv.tariffChg = a;
else
{
ac->priv.tariffChg = a;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error in parameter ChgTariff";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgtariff read failed for admin '%s'\n", ac->login.c_str());
return -1;
errorStr = "Error in parameter ChgTariff";
printfd(__FILE__, "FILES_STORE::RestoreAdmin - chgtariff read failed for admin '%s'\n", ac->login.c_str());
return -1;
@@
-1309,7
+1308,7
@@
std::string fileName;
strprintf(&fileName, "%s/%s.tf", storeSettings.GetTariffsDir().c_str(), name.c_str());
if (Touch(fileName))
{
strprintf(&fileName, "%s/%s.tf", storeSettings.GetTariffsDir().c_str(), name.c_str());
if (Touch(fileName))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot create file " + fileName;
printfd(__FILE__, "FILES_STORE::AddTariff - failed to add tariff '%s'\n", name.c_str());
return -1;
errorStr = "Cannot create file " + fileName;
printfd(__FILE__, "FILES_STORE::AddTariff - failed to add tariff '%s'\n", name.c_str());
return -1;
@@
-1323,7
+1322,7
@@
std::string fileName;
strprintf(&fileName, "%s/%s.tf", storeSettings.GetTariffsDir().c_str(), name.c_str());
if (unlink(fileName.c_str()))
{
strprintf(&fileName, "%s/%s.tf", storeSettings.GetTariffsDir().c_str(), name.c_str());
if (unlink(fileName.c_str()))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "unlink failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
errorStr = "unlink failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
@@
-1341,7
+1340,7
@@
td->tariffConf.name = tariffName;
if (conf.Error() != 0)
{
if (conf.Error() != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read file " + fileName;
printfd(__FILE__, "FILES_STORE::RestoreTariff - failed to read tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read file " + fileName;
printfd(__FILE__, "FILES_STORE::RestoreTariff - failed to read tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1353,7
+1352,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "Time%d", i);
if (conf.ReadString(param, &str, "00:00-00:00") < 0)
{
strprintf(¶m, "Time%d", i);
if (conf.ReadString(param, &str, "00:00-00:00") < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - time%d read failed for tariff '%s'\n", i, tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - time%d read failed for tariff '%s'\n", i, tariffName.c_str());
return -1;
@@
-1368,7
+1367,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "PriceDayA%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceDayA, 0.0) < 0)
{
strprintf(¶m, "PriceDayA%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceDayA, 0.0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricedaya read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricedaya read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1378,7
+1377,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "PriceDayB%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceDayB, 0.0) < 0)
{
strprintf(¶m, "PriceDayB%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceDayB, 0.0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricedayb read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricedayb read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1388,7
+1387,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "PriceNightA%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceNightA, 0.0) < 0)
{
strprintf(¶m, "PriceNightA%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceNightA, 0.0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricenighta read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricenighta read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1398,7
+1397,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "PriceNightB%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceNightB, 0.0) < 0)
{
strprintf(¶m, "PriceNightB%d", i);
if (conf.ReadDouble(param, &td->dirPrice[i].priceNightB, 0.0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricenightb read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - pricenightb read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1408,7
+1407,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "Threshold%d", i);
if (conf.ReadInt(param, &td->dirPrice[i].threshold, 0) < 0)
{
strprintf(¶m, "Threshold%d", i);
if (conf.ReadInt(param, &td->dirPrice[i].threshold, 0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - threshold read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - threshold read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1417,7
+1416,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "SinglePrice%d", i);
if (conf.ReadInt(param, &td->dirPrice[i].singlePrice, 0) < 0)
{
strprintf(¶m, "SinglePrice%d", i);
if (conf.ReadInt(param, &td->dirPrice[i].singlePrice, 0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - singleprice read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - singleprice read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1426,7
+1425,7
@@
for (int i = 0; i<DIR_NUM; i++)
strprintf(¶m, "NoDiscount%d", i);
if (conf.ReadInt(param, &td->dirPrice[i].noDiscount, 0) < 0)
{
strprintf(¶m, "NoDiscount%d", i);
if (conf.ReadInt(param, &td->dirPrice[i].noDiscount, 0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - nodiscount read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
printfd(__FILE__, "FILES_STORE::RestoreTariff - nodiscount read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1435,7
+1434,7
@@
for (int i = 0; i<DIR_NUM; i++)
if (conf.ReadDouble("Fee", &td->tariffConf.fee, 0) < 0)
{
if (conf.ReadDouble("Fee", &td->tariffConf.fee, 0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter Fee";
printfd(__FILE__, "FILES_STORE::RestoreTariff - fee read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter Fee";
printfd(__FILE__, "FILES_STORE::RestoreTariff - fee read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1443,7
+1442,7
@@
if (conf.ReadDouble("Fee", &td->tariffConf.fee, 0) < 0)
if (conf.ReadDouble("Free", &td->tariffConf.free, 0) < 0)
{
if (conf.ReadDouble("Free", &td->tariffConf.free, 0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter Free";
printfd(__FILE__, "FILES_STORE::RestoreTariff - free read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter Free";
printfd(__FILE__, "FILES_STORE::RestoreTariff - free read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1451,7
+1450,7
@@
if (conf.ReadDouble("Free", &td->tariffConf.free, 0) < 0)
if (conf.ReadDouble("PassiveCost", &td->tariffConf.passiveCost, 0) < 0)
{
if (conf.ReadDouble("PassiveCost", &td->tariffConf.passiveCost, 0) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter PassiveCost";
printfd(__FILE__, "FILES_STORE::RestoreTariff - passivecost read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter PassiveCost";
printfd(__FILE__, "FILES_STORE::RestoreTariff - passivecost read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1459,7
+1458,7
@@
if (conf.ReadDouble("PassiveCost", &td->tariffConf.passiveCost, 0) < 0)
if (conf.ReadString("TraffType", &str, "") < 0)
{
if (conf.ReadString("TraffType", &str, "") < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter TraffType";
printfd(__FILE__, "FILES_STORE::RestoreTariff - trafftype read failed for tariff '%s'\n", tariffName.c_str());
return -1;
errorStr = "Cannot read tariff " + tariffName + ". Parameter TraffType";
printfd(__FILE__, "FILES_STORE::RestoreTariff - trafftype read failed for tariff '%s'\n", tariffName.c_str());
return -1;
@@
-1478,11
+1477,16
@@
else
td->tariffConf.traffType = TRAFF_MAX;
else
{
td->tariffConf.traffType = TRAFF_MAX;
else
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read tariff " + tariffName + ". Parameter TraffType incorrect";
printfd(__FILE__, "FILES_STORE::RestoreTariff - invalid trafftype for tariff '%s'\n", tariffName.c_str());
return -1;
}
errorStr = "Cannot read tariff " + tariffName + ". Parameter TraffType incorrect";
printfd(__FILE__, "FILES_STORE::RestoreTariff - invalid trafftype for tariff '%s'\n", tariffName.c_str());
return -1;
}
+
+if (conf.ReadString("Period", &str, "month") < 0)
+ td->tariffConf.period = TARIFF::MONTH;
+else
+ td->tariffConf.period = TARIFF::StringToPeriod(str);
return 0;
}
//-----------------------------------------------------------------------------
return 0;
}
//-----------------------------------------------------------------------------
@@
-1497,7
+1501,7
@@
std::string fileName = storeSettings.GetTariffsDir() + "/" + tariffName + ".tf";
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error writing tariff " + tariffName;
printfd(__FILE__, "FILES_STORE::RestoreTariff - failed to save tariff '%s'\n", tariffName.c_str());
return e;
errorStr = "Error writing tariff " + tariffName;
printfd(__FILE__, "FILES_STORE::RestoreTariff - failed to save tariff '%s'\n", tariffName.c_str());
return e;
@@
-1558,6
+1562,8
@@
std::string fileName = storeSettings.GetTariffsDir() + "/" + tariffName + ".tf";
cf.WriteString("TraffType", "max");
break;
}
cf.WriteString("TraffType", "max");
break;
}
+
+ cf.WriteString("Period", TARIFF::PeriodToString(td.tariffConf.period));
}
return 0;
}
return 0;
@@
-1580,7
+1586,7
@@
if (access(dn, F_OK) != 0)
{
if (mkdir(dn, 0700) != 0)
{
{
if (mkdir(dn, 0700) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Directory \'" + std::string(dn) + "\' cannot be created.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "Directory \'" + std::string(dn) + "\' cannot be created.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-1592,7
+1598,7
@@
e += chmod(dn, storeSettings.GetStatModeDir());
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-1613,7
+1619,7
@@
if (access(dn, F_OK) != 0)
{
if (mkdir(dn, 0700) != 0)
{
{
if (mkdir(dn, 0700) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Directory \'" + std::string(dn) + "\' cannot be created.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "Directory \'" + std::string(dn) + "\' cannot be created.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-1625,7
+1631,7
@@
e += chmod(dn, storeSettings.GetStatModeDir());
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-1639,7
+1645,7
@@
if (access(dn, F_OK) != 0)
{
if (mkdir(dn, 0700) != 0)
{
{
if (mkdir(dn, 0700) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Directory \'" + std::string(dn) + "\' cannot be created.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "Directory \'" + std::string(dn) + "\' cannot be created.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - mkdir failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-1651,7
+1657,7
@@
e += chmod(dn, storeSettings.GetStatModeDir());
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-1661,7
+1667,7
@@
statFile = fopen (fn, "at");
if (!statFile)
{
if (!statFile)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "File \'" + std::string(fn) + "\' cannot be written.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = "File \'" + std::string(fn) + "\' cannot be written.";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-1688,7
+1694,7
@@
s2 = lt2->tm_sec;
if (fprintf(statFile, "-> %02d.%02d.%02d - %02d.%02d.%02d\n",
h1, m1, s1, h2, m2, s2) < 0)
{
if (fprintf(statFile, "-> %02d.%02d.%02d - %02d.%02d.%02d\n",
h1, m1, s1, h2, m2, s2) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("fprint failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - fprintf failed. Message: '%s'\n", strerror(errno));
fclose(statFile);
errorStr = std::string("fprint failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::WriteDetailStat - fprintf failed. Message: '%s'\n", strerror(errno));
fclose(statFile);
@@
-1712,7
+1718,7
@@
while (stIter != statTree.end())
u.c_str(),
stIter->second.cash) < 0)
{
u.c_str(),
stIter->second.cash) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "fprint failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
errorStr = "fprint failed. Message: '";
errorStr += strerror(errno);
errorStr += "'";
@@
-1728,7
+1734,7
@@
while (stIter != statTree.end())
u.c_str(),
stIter->second.cash) < 0)
{
u.c_str(),
stIter->second.cash) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("fprint failed. Message: '");
errorStr += strerror(errno);
errorStr += "'";
errorStr = std::string("fprint failed. Message: '");
errorStr += strerror(errno);
errorStr += "'";
@@
-1748,7
+1754,7
@@
e += chmod(fn, storeSettings.GetStatMode());
if (e)
{
if (e)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
}
@@
-1766,7
+1772,7
@@
if (access(dn.c_str(), F_OK) != 0)
{
if (mkdir(dn.c_str(), 0700) != 0)
{
{
if (mkdir(dn.c_str(), 0700) != 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Directory \'";
errorStr += dn;
errorStr += "\' cannot be created.";
errorStr = "Directory \'";
errorStr += dn;
errorStr += "\' cannot be created.";
@@
-1784,7
+1790,7
@@
strprintf(&fn, "%s/%lld", dn.c_str(), msg->header.id);
if (Touch(fn))
{
if (Touch(fn))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "File \'";
errorStr += fn;
errorStr += "\' cannot be writen.";
errorStr = "File \'";
errorStr += fn;
errorStr += "\' cannot be writen.";
@@
-1806,7
+1812,7
@@
if (access(fileName.c_str(), F_OK) != 0)
{
std::string idstr;
x2str(msg.header.id, idstr);
{
std::string idstr;
x2str(msg.header.id, idstr);
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Message for user \'";
errorStr += login + "\' with ID \'";
errorStr += idstr + "\' does not exist.";
errorStr = "Message for user \'";
errorStr += login + "\' with ID \'";
errorStr += idstr + "\' does not exist.";
@@
-1819,14
+1825,14
@@
Touch(fileName + ".new");
msgFile = fopen((fileName + ".new").c_str(), "wt");
if (!msgFile)
{
msgFile = fopen((fileName + ".new").c_str(), "wt");
if (!msgFile)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "File \'" + fileName + "\' cannot be writen.";
printfd(__FILE__, "FILES_STORE::EditMessage - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
}
bool res = true;
errorStr = "File \'" + fileName + "\' cannot be writen.";
printfd(__FILE__, "FILES_STORE::EditMessage - fopen failed. Message: '%s'\n", strerror(errno));
return -1;
}
bool res = true;
-res &= (fprintf(msgFile, "%
d
\n", msg.header.type) >= 0);
+res &= (fprintf(msgFile, "%
u
\n", msg.header.type) >= 0);
res &= (fprintf(msgFile, "%u\n", msg.header.lastSendTime) >= 0);
res &= (fprintf(msgFile, "%u\n", msg.header.creationTime) >= 0);
res &= (fprintf(msgFile, "%u\n", msg.header.showTime) >= 0);
res &= (fprintf(msgFile, "%u\n", msg.header.lastSendTime) >= 0);
res &= (fprintf(msgFile, "%u\n", msg.header.creationTime) >= 0);
res &= (fprintf(msgFile, "%u\n", msg.header.showTime) >= 0);
@@
-1836,7
+1842,7
@@
res &= (fprintf(msgFile, "%s", msg.text.c_str()) >= 0);
if (!res)
{
if (!res)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("fprintf failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::EditMessage - fprintf failed. Message: '%s'\n", strerror(errno));
fclose(msgFile);
errorStr = std::string("fprintf failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::EditMessage - fprintf failed. Message: '%s'\n", strerror(errno));
fclose(msgFile);
@@
-1849,9
+1855,9
@@
chmod((fileName + ".new").c_str(), storeSettings.GetConfMode());
if (rename((fileName + ".new").c_str(), fileName.c_str()) < 0)
{
if (rename((fileName + ".new").c_str(), fileName.c_str()) < 0)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Error moving dir from " + fileName + ".new to " + fileName;
errorStr = "Error moving dir from " + fileName + ".new to " + fileName;
- printfd(__FILE__, "FILES_STORE::
SaveTariff
- rename failed. Message: '%s'\n", strerror(errno));
+ printfd(__FILE__, "FILES_STORE::
EditMessage
- rename failed. Message: '%s'\n", strerror(errno));
return -1;
}
return -1;
}
@@
-1894,7
+1900,7
@@
for (unsigned i = 0; i < messages.size(); i++)
{
if (unlink((dn + messages[i]).c_str()))
{
{
if (unlink((dn + messages[i]).c_str()))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("unlink failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::GetMessageHdrs - unlink failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = std::string("unlink failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::GetMessageHdrs - unlink failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-1912,7
+1918,7
@@
for (unsigned i = 0; i < messages.size(); i++)
{
if (unlink((dn + messages[i]).c_str()))
{
{
if (unlink((dn + messages[i]).c_str()))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = std::string("unlink failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::GetMessageHdrs - unlink failed. Message: '%s'\n", strerror(errno));
return -1;
errorStr = std::string("unlink failed. Message: '") + strerror(errno) + "'";
printfd(__FILE__, "FILES_STORE::GetMessageHdrs - unlink failed. Message: '%s'\n", strerror(errno));
return -1;
@@
-1934,7
+1940,7
@@
FILE * msgFile;
msgFile = fopen(fileName.c_str(), "rt");
if (!msgFile)
{
msgFile = fopen(fileName.c_str(), "rt");
if (!msgFile)
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "File \'";
errorStr += fileName;
errorStr += "\' cannot be openned.";
errorStr = "File \'";
errorStr += fileName;
errorStr += "\' cannot be openned.";
@@
-1955,7
+1961,7
@@
memset(p, 0, sizeof(p));
for (int pos = 0; pos < 6; pos++)
{
if (fgets(p, sizeof(p) - 1, msgFile) == NULL) {
for (int pos = 0; pos < 6; pos++)
{
if (fgets(p, sizeof(p) - 1, msgFile) == NULL) {
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read file \'";
errorStr += fileName;
errorStr += "\'. Missing data.";
errorStr = "Cannot read file \'";
errorStr += fileName;
errorStr += "\'. Missing data.";
@@
-1973,7
+1979,7
@@
for (int pos = 0; pos < 6; pos++)
if (feof(msgFile))
{
if (feof(msgFile))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read file \'";
errorStr += fileName;
errorStr += "\'. Missing data.";
errorStr = "Cannot read file \'";
errorStr += fileName;
errorStr += "\'. Missing data.";
@@
-1985,7
+1991,7
@@
for (int pos = 0; pos < 6; pos++)
if (str2x(p, *(d[pos])))
{
if (str2x(p, *(d[pos])))
{
- STG_LOCKER lock(&mutex
, __FILE__, __LINE__
);
+ STG_LOCKER lock(&mutex);
errorStr = "Cannot read file \'";
errorStr += fileName;
errorStr += "\'. Incorrect value. \'";
errorStr = "Cannot read file \'";
errorStr += fileName;
errorStr += "\'. Incorrect value. \'";
git.stg.codes / stg.git / blobdiff