aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-06-20 10:42:57 +0100
committerMatthew Wild <mwild1@gmail.com>2018-06-20 10:42:57 +0100
commitf219f3752e968b6c5bfda21f968ca3f8a3b81a32 (patch)
tree8654a05701a0cf548f1d819afcb3a5bdc81c49ea
parent01581a23c2ac4f057e68a08ebbc3f79b9d837e3b (diff)
downloadprosody-f219f3752e968b6c5bfda21f968ca3f8a3b81a32.tar.gz
prosody-f219f3752e968b6c5bfda21f968ca3f8a3b81a32.zip
prosodyctl: check: Replace loaded-module calculation with a more accurate query to modulemanager, fixes #1171
-rwxr-xr-xprosodyctl8
1 files changed, 5 insertions, 3 deletions
diff --git a/prosodyctl b/prosodyctl
index 086e5782..e8f7075a 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -1079,9 +1079,11 @@ function commands.check(arg)
target_hosts:remove("localhost");
end
- local modules = set.new(it.to_array(it.values(host_options.modules_enabled or {})))
- + set.new(it.to_array(it.values(configmanager.get("*", "modules_enabled") or {})))
- + set.new({ configmanager.get(host, "component_module") });
+ local modules, component_module = modulemanager.get_modules_for_host(host);
+
+ if component_module then
+ modules:add(component_module);
+ end
if modules:contains("proxy65") then
local proxy65_target = configmanager.get(host, "proxy65_address") or host;