mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_http_file_share: Keep global storage use accurate longer.

Browse source 
Merging those loops removes the miscounting that would occur in case a
file could not be deleted, so no need to limit it to that case.
This commit is contained in:
Kim Alvefur 2021-11-30 00:55:54 +01:00
parent d2f4a57bfc
commit 82f6358657
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/mod_http_file_share.lua
View file

@ -500,10 +500,6 @@ if expiry >= 0 and not external_base_url then
local deletion_query = {["end"] = boundary_time};
if not problem_deleting then
module:log("info", "All (%d, %s) expired files successfully deleted", n, B(size_sum));
if total_storage_usage then
total_storage_usage = total_storage_usage - size_sum;
module:log("debug", "Global quota %s / %s", B(total_storage_usage), B(total_storage_limit));
end
-- we can delete based on time
else
module:log("warn", "%d out of %d expired files could not be deleted", n-#obsolete_uploads, n);
@ -511,10 +507,14 @@ if expiry >= 0 and not external_base_url then
-- successfully deleted, and then try again with the failed ones.
-- eventually the admin ought to notice and fix the permissions or
-- whatever the problem is.
-- total_storage_limit will be inaccurate until this has been resolved
deletion_query = {ids = obsolete_uploads};
end
if total_storage_usage then
total_storage_usage = total_storage_usage - size_sum;
module:log("debug", "Global quota %s / %s", B(total_storage_usage), B(total_storage_limit));
end
if #obsolete_uploads == 0 then
module:log("debug", "No metadata to remove");
else