mirror/nzbget
1
0 Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-08-07 07:52:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

#99: separate quota reached flag

Browse Source 
- using separate “quota reached”-flag instead of changing global pause
state;
 - new field “QuotaReached” in RPC-method “Status”.
This commit is contained in:
Andrey Prygunkov committed 2016-04-15 20:47:04 +02:00
1 parent a4a3d1bc7a
commit dd4df8b734
8 files changed
+35 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

daemon/nntp/StatMeter.cpp
+15 -13
View File
@@ -456,7 +456,7 @@ bool StatMeter::Load(bool* perfectServerMatch)
void StatMeter::CheckQuota()
{
if ((g_Options->GetDailyQuota() == 0 && g_Options->GetMonthlyQuota() == 0) || g_Options->GetQuotaPause())
if ((g_Options->GetDailyQuota() == 0 && g_Options->GetMonthlyQuota() == 0))
{
return;
}
@@ -464,21 +464,23 @@ void StatMeter::CheckQuota()
int64 monthBytes, dayBytes;
CalcQuotaUsage(monthBytes, dayBytes);
if (g_Options->GetDailyQuota() > 0 && dayBytes >= (int64)g_Options->GetDailyQuota() * 1024 * 1024)
bool monthlyQuotaReached = g_Options->GetMonthlyQuota() > 0 && monthBytes >= (int64)g_Options->GetMonthlyQuota() * 1024 * 1024;
bool dailyQuotaReached = g_Options->GetDailyQuota() > 0 && dayBytes >= (int64)g_Options->GetDailyQuota() * 1024 * 1024;
if (monthlyQuotaReached && !g_Options->GetQuotaReached())
{
warn("Daily quota reached at %s. Pausing download", *Util::FormatSize(dayBytes));
g_Options->SetQuotaPause(true);
g_Options->SetPauseDownload(true);
return;
warn("Monthly quota reached at %s", *Util::FormatSize(monthBytes));
}
else if (dailyQuotaReached && !g_Options->GetQuotaReached())
{
warn("Daily quota reached at %s", *Util::FormatSize(dayBytes));
}
else if (!monthlyQuotaReached && !dailyQuotaReached && g_Options->GetQuotaReached())
{
info("Quota lifted");
}
if (g_Options->GetMonthlyQuota() > 0 && monthBytes >= (int64)g_Options->GetMonthlyQuota() * 1024 * 1024)
{
warn("Monthly quota reached at %s. Pausing download", *Util::FormatSize(monthBytes));
g_Options->SetQuotaPause(true);
g_Options->SetPauseDownload(true);
return;
}
g_Options->SetQuotaReached(monthlyQuotaReached || dailyQuotaReached);
}
void StatMeter::CalcQuotaUsage(int64& monthBytes, int64& dayBytes)