Comparison

mod_admin_shell: Report when a module is already loaded Hopefully less confusing than "Module loaded onto 0 hosts"

comparison

equal deleted inserted replaced

-:d8f7a8a26965
+:f77c247258cc
 describe_command [[module:load(module, host) - Load the specified module on the specified host (or all hosts if none given)]]
 function def_env.module:load(name, hosts)
 	hosts = get_hosts_with_module(hosts);
+	local already_loaded = set.new();
 	-- Load the module for each host
 	local ok, err, count, mod = true, nil, 0;
 	for host in hosts do
 		local configured_modules, component = modulemanager.get_modules_for_host(host);
 				if not (configured_modules:contains(name) or name == component) then
 					self.session.print("Note: Module will not be loaded after restart unless enabled in configuration");
 				end
 			end
+		else
+			already_loaded:add(host);
 		end
 	end
 	if not ok then
 		return ok, "Last error: "..tostring(err);
+	end
+	if already_loaded == hosts then
+		return ok, "Module already loaded";
 	end
 	return ok, "Module loaded onto "..count.." host"..(count ~= 1 and "s" or "");
 end
 describe_command [[module:unload(module, host) - The same, but just unloads the module from memory]]