X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5c0444f61fac031c47cac726e0b0bb9188f6eb18..a84a49ca1eb7c31f79f6328e9dc453399ee120f9:/projects/stargazer/user_impl.cpp diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index 92528a6f..d6c749b7 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -80,7 +80,7 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, const USERS * u, const SERVICES & svcs) : users(u), - property(s->GetScriptsDir()), + property(*s), WriteServLog(GetStgLogger()), lastScanMessages(0), id(0), @@ -134,6 +134,8 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, userdata7(property.userdata7), userdata8(property.userdata8), userdata9(property.userdata9), + sessionUploadModTime(stgTime), + sessionDownloadModTime(stgTime), passiveNotifier(this), disabledNotifier(this), tariffNotifier(this), @@ -150,7 +152,7 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, const USERS * u, const SERVICES & svcs) : users(u), - property(s->GetScriptsDir()), + property(*s), WriteServLog(GetStgLogger()), lastScanMessages(0), id(0), @@ -204,6 +206,8 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, userdata7(property.userdata7), userdata8(property.userdata8), userdata9(property.userdata9), + sessionUploadModTime(stgTime), + sessionDownloadModTime(stgTime), passiveNotifier(this), disabledNotifier(this), tariffNotifier(this), @@ -237,7 +241,7 @@ pthread_mutex_init(&mutex, &attr); USER_IMPL::USER_IMPL(const USER_IMPL & u) : USER(), users(u.users), - property(u.settings->GetScriptsDir()), + property(*u.settings), WriteServLog(GetStgLogger()), lastScanMessages(0), login(u.login), @@ -298,6 +302,8 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u) userdata9(property.userdata9), sessionUpload(), sessionDownload(), + sessionUploadModTime(stgTime), + sessionDownloadModTime(stgTime), passiveNotifier(this), disabledNotifier(this), tariffNotifier(this), @@ -621,7 +627,7 @@ if (!fakeConnect) connected = true; } -if (store->WriteUserConnect(login, currIP)) +if (!settings->GetDisableSessionLog() && store->WriteUserConnect(login, currIP)) { WriteServLog("Cannot write connect for user %s.", login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); @@ -685,8 +691,8 @@ std::string reasonMessage(reason); if (!lastDisconnectReason.empty()) reasonMessage += ": " + lastDisconnectReason; -if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, - cash, freeMb, reasonMessage)) +if (!settings->GetDisableSessionLog() && store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, + cash, freeMb, reasonMessage)) { WriteServLog("Cannot write disconnect for user %s.", login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); @@ -1184,7 +1190,7 @@ if (nextTariff.ConstData() != "") } else { - std::string message = tariff->TariffChangeIsAllowed(*nt); + std::string message = tariff->TariffChangeIsAllowed(*nt, stgTime); if (message.empty()) { property.tariffName.Set(nextTariff, sysAdmin, login, store);