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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2024-10-26 12:43:53 +02:00
commit a7cff6b464
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugins/mod_admin_adhoc.lua
View file

@ -592,15 +592,15 @@ end, function(fields, err, data)
return generate_error_message(err);
end
local ok_list, err_list = {}, {};
for _, module in ipairs(fields.modules) do
local ok, err = modulemanager.reload(module_host, module);
for _, module_ in ipairs(fields.modules) do
local ok, err = modulemanager.reload(module_host, module_);
if ok then
ok_list[#ok_list + 1] = module;
ok_list[#ok_list + 1] = module_;
else
err_list[#err_list + 1] = module .. "(Error: " .. tostring(err) .. ")";
err_list[#err_list + 1] = module_ .. "(Error: " .. tostring(err) .. ")";
end
module:log("info", "mod_%s reloaded by %s", module_, jid.bare(data.from));
end
module:log("info", "mod_%s reloaded by %s", fields.module, jid.bare(data.from));
local info = (#ok_list > 0 and ("The following modules were successfully reloaded on host "..module_host..":\n"..t_concat(ok_list, "\n")) or "")
.. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
(#err_list > 0 and ("Failed to reload the following modules on host "..module_host..":\n"..t_concat(err_list, "\n")) or "");
@ -742,15 +742,15 @@ end, function(fields, err, data)
return generate_error_message(err);
end
local ok_list, err_list = {}, {};
for _, module in ipairs(fields.modules) do
local ok, err = modulemanager.unload(module_host, module);
for _, module_ in ipairs(fields.modules) do
local ok, err = modulemanager.unload(module_host, module_);
if ok then
ok_list[#ok_list + 1] = module;
ok_list[#ok_list + 1] = module_;
else
err_list[#err_list + 1] = module .. "(Error: " .. tostring(err) .. ")";
err_list[#err_list + 1] = module_ .. "(Error: " .. tostring(err) .. ")";
end
module:log("info", "mod_%s unloaded by %s", module_, jid.bare(data.from));
end
module:log("info", "mod_%s unloaded by %s", fields.module, jid.bare(data.from));
local info = (#ok_list > 0 and ("The following modules were successfully unloaded on host "..module_host..":\n"..t_concat(ok_list, "\n")) or "")
.. ((#ok_list > 0 and #err_list > 0) and "\n" or "") ..
(#err_list > 0 and ("Failed to unload the following modules on host "..module_host..":\n"..t_concat(err_list, "\n")) or "");