diff options
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 3 | ||||
| -rwxr-xr-x | prosody | 2 | ||||
| -rwxr-xr-x | prosodyctl | 6 | ||||
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 2 | ||||
| -rw-r--r-- | util/prosodyctl.lua | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 8787427e..cdac7d4e 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -15,6 +15,9 @@ local hosts = prosody.hosts; local console_listener = { default_port = 5582; default_mode = "*l"; interface = "127.0.0.1" }; +local hostmanager = require "core.hostmanager"; +local modulemanager = require "core.modulemanager"; + local iterators = require "util.iterators"; local keys, values = iterators.keys, iterators.values; local jid = require "util.jid"; @@ -128,7 +128,7 @@ function log_dependency_warnings() end function sanity_check() - for host, host_config in pairs(configmanager.getconfig()) do + for host, host_config in pairs(config.getconfig()) do if host ~= "*" and host_config.core.enabled ~= false and not host_config.core.component_module then @@ -227,9 +227,9 @@ for hostname, config in pairs(config.getconfig()) do hosts[hostname] = make_host(hostname); end -require "core.modulemanager" +local modulemanager = require "core.modulemanager" -require "util.prosodyctl" +local prosodyctl = require "util.prosodyctl" require "socket" ----------------------- @@ -509,7 +509,7 @@ function commands.about(arg) return 1; end - require "util.array"; + local array = require "util.array"; local keys = require "util.iterators".keys; print("Prosody "..(prosody.version or "(unknown version)")); diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 545bd922..656f0824 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -15,7 +15,7 @@ if arg[0]:match("^./") then package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua"); end -require "erlparse"; +local erlparse = require "erlparse"; prosody = {}; diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index 439de551..a598a44a 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -273,3 +273,5 @@ function reload() signal.kill(pid, signal.SIGHUP); return true; end + +return _M; |