projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index b411370fb1f0b63e4d8ed0f9d7c24061525c8545..8fcee8e840e45f795f9bd64ed0a22861352c7df4 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-49,9
+49,6
@@
_G.prosody = prosody;
-- Check dependencies
local dependencies = require "util.dependencies";
-- Check dependencies
local dependencies = require "util.dependencies";
-if not dependencies.check_dependencies() then
- os.exit(1);
-end
-- Load the config-parsing module
config = require "core.configmanager"
-- Load the config-parsing module
config = require "core.configmanager"
@@
-116,6
+113,12
@@
function read_config()
end
end
end
end
+function check_dependencies()
+ if not dependencies.check_dependencies() then
+ os.exit(1);
+ end
+end
+
function load_libraries()
-- Load socket framework
server = require "net.server"
function load_libraries()
-- Load socket framework
server = require "net.server"
@@
-382,6
+385,7
@@
init_logging();
sanity_check();
sandbox_require();
set_function_metatable();
sanity_check();
sandbox_require();
set_function_metatable();
+check_dependencies();
load_libraries();
init_global_state();
read_version();
load_libraries();
init_global_state();
read_version();