# HG changeset patch # User Aidan Epstein <aidan@jmad.org> # Date 1727658557 25200 # Node ID c228f1ffb7b3a59ed33a73fe60140d80cd6b47f2 # Parent 0b6af170617be5f138819ac92553b6780c915816 mod_admin_adhoc: Fix log messages for reloading modules. Also rename for loop item so that it doesn't shadow module variable. diff -r 0b6af170617b -r c228f1ffb7b3 plugins/mod_admin_adhoc.lua --- a/plugins/mod_admin_adhoc.lua Wed Jul 31 22:06:18 2024 +0200 +++ b/plugins/mod_admin_adhoc.lua Sun Sep 29 18:09:17 2024 -0700 @@ -530,15 +530,15 @@ 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 ""); @@ -680,15 +680,15 @@ 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 "");