projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f6920d
)
mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules...
author
Florian Zeitz
<florob@babelmonkeys.de>
Sat, 9 Jun 2012 00:27:44 +0000
(
02:27
+0200)
committer
Florian Zeitz
<florob@babelmonkeys.de>
Sat, 9 Jun 2012 00:27:44 +0000
(
02:27
+0200)
plugins/mod_admin_telnet.lua
patch
|
blob
|
history
prosody
patch
|
blob
|
history
prosodyctl
patch
|
blob
|
history
tools/ejabberd2prosody.lua
patch
|
blob
|
history
util/prosodyctl.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_admin_telnet.lua
b/plugins/mod_admin_telnet.lua
index 8787427e29a38a189c9b1b5aff5692be773166e8..cdac7d4e950f168d5f1e1231d8ab27f8f31e27b6 100644
(file)
--- 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 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";
local iterators = require "util.iterators";
local keys, values = iterators.keys, iterators.values;
local jid = require "util.jid";
diff --git
a/prosody
b/prosody
index 6f5a14eb9521e9d3fa8f9019eb2f8eadbba8e1ae..b8de92f59c4f235d0dc8e64b8d3c45b345a9cada 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-128,7
+128,7
@@
function log_dependency_warnings()
end
function sanity_check()
end
function sanity_check()
- for host, host_config in pairs(config
manager
.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
if host ~= "*"
and host_config.core.enabled ~= false
and not host_config.core.component_module then
diff --git
a/prosodyctl
b/prosodyctl
index 0e733d07b8b47cf3a2842e7a121de0b4a1829385..0817db3554c676d659c441adb8b63f44573a422e 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-227,9
+227,9
@@
for hostname, config in pairs(config.getconfig()) do
hosts[hostname] = make_host(hostname);
end
hosts[hostname] = make_host(hostname);
end
-require "core.modulemanager"
+
local modulemanager =
require "core.modulemanager"
-require "util.prosodyctl"
+
local prosodyctl =
require "util.prosodyctl"
require "socket"
-----------------------
require "socket"
-----------------------
@@
-509,7
+509,7
@@
function commands.about(arg)
return 1;
end
return 1;
end
- require "util.array";
+
local array =
require "util.array";
local keys = require "util.iterators".keys;
print("Prosody "..(prosody.version or "(unknown version)"));
local keys = require "util.iterators".keys;
print("Prosody "..(prosody.version or "(unknown version)"));
@@
-688,7
+688,7
@@
function cert_commands.key(arg)
show_message("There was a problem, see OpenSSL output");
else
show_usage("cert key HOSTNAME <bits>", "Generates a RSA key named HOSTNAME.key\n "
show_message("There was a problem, see OpenSSL output");
else
show_usage("cert key HOSTNAME <bits>", "Generates a RSA key named HOSTNAME.key\n "
- .."Promp
t
s for a key size if none given")
+ .."Promps for a key size if none given")
end
end
end
end
diff --git
a/tools/ejabberd2prosody.lua
b/tools/ejabberd2prosody.lua
index 545bd9226f790eccd2689ab09a272a78b065c8e6..656f0824fc868982a9d3e9a9d7c2a8549204e512 100755
(executable)
--- 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
package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua");
end
-require "erlparse";
+
local erlparse =
require "erlparse";
prosody = {};
prosody = {};
diff --git
a/util/prosodyctl.lua
b/util/prosodyctl.lua
index 439de551687d6c87bc3aa826e6ac5201a3f8e8a7..a598a44aaaa30e3b1ed52b185718b8ee0f966973 100644
(file)
--- a/
util/prosodyctl.lua
+++ b/
util/prosodyctl.lua
@@
-273,3
+273,5
@@
function reload()
signal.kill(pid, signal.SIGHUP);
return true;
end
signal.kill(pid, signal.SIGHUP);
return true;
end
+
+return _M;