prosody
c228f1ffb7b3

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

13528:c228f1ffb7b3 0.12

mod_admin_adhoc: Fix log messages for reloading modules. Also rename for loop item so that it doesn't shadow module variable.
author Aidan Epstein <aidan@jmad.org>
date Sun, 29 Sep 2024 18:09:17 -0700
parents 13519:0b6af170617b
children 13529:3ec7222349ac 13543:01d2abc3d17c
files plugins/mod_admin_adhoc.lua
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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 "");