projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Return status code depending on whether tests passed
[prosody.git]
/
prosodyctl
diff --git
a/prosodyctl
b/prosodyctl
index ef436106948a2ae316172a3b610cce2db8e7c0e8..0a4491bff119a1fb824bfc8496d023e2dd3ebd57 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-244,7
+244,7
@@
end
local modulemanager = require "core.modulemanager"
local prosodyctl = require "util.prosodyctl"
local modulemanager = require "core.modulemanager"
local prosodyctl = require "util.prosodyctl"
-require "socket"
+
local socket =
require "socket"
-----------------------
-- FIXME: Duplicate code waiting for util.startup
-----------------------
-- FIXME: Duplicate code waiting for util.startup
@@
-578,6
+578,8
@@
function commands.about(arg)
print("");
print("# Lua module versions");
local module_versions, longest_name = {}, 8;
print("");
print("# Lua module versions");
local module_versions, longest_name = {}, 8;
+ local luaevent =dependencies.softreq"luaevent";
+ local ssl = dependencies.softreq"ssl";
for name, module in pairs(package.loaded) do
if type(module) == "table" and rawget(module, "_VERSION")
and name ~= "_G" and not name:match("%.") then
for name, module in pairs(package.loaded) do
if type(module) == "table" and rawget(module, "_VERSION")
and name ~= "_G" and not name:match("%.") then
@@
-839,7
+841,8
@@
function commands.check(arg)
});
local known_global_options = set.new({
"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
});
local known_global_options = set.new({
"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
- "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings"
+ "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings",
+ "network_backend", "http_default_host",
});
local config = config.getconfig();
-- Check that we have any global options (caused by putting a host at the top)
});
local config = config.getconfig();
-- Check that we have any global options (caused by putting a host at the top)