diff options
| author | Kim Alvefur <zash@zash.se> | 2024-10-26 12:43:53 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2024-10-26 12:43:53 +0200 |
| commit | a7cff6b46411be9a09b47a719c18467cebd7858a (patch) | |
| tree | ebb6d0cc1c20b6b2638eb89d1a11a7b77e855755 | |
| parent | a63544d6cf0825f53cf6a7fe5a1ec8c35219641a (diff) | |
| parent | f964cc51bba298633c58d2ae640a7ddd1feb9eed (diff) | |
| download | prosody-a7cff6b46411be9a09b47a719c18467cebd7858a.tar.gz prosody-a7cff6b46411be9a09b47a719c18467cebd7858a.zip | |
Merge 0.12->trunk
| -rw-r--r-- | plugins/mod_admin_adhoc.lua | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua index ee26b7e5..ca84f975 100644 --- a/plugins/mod_admin_adhoc.lua +++ b/plugins/mod_admin_adhoc.lua @@ -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 ""); |