From 6d96edf726384aa2ce4fd0f5479cf98a39c3b1ef Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 20 Dec 2010 14:06:16 +0000 Subject: prosody, prosodyctl, util.dependencies: Split checking and logging of dependencies so we can check hard deps before the config and logging is loaded --- prosodyctl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'prosodyctl') diff --git a/prosodyctl b/prosodyctl index cfc5ca77..9630a9b8 100755 --- a/prosodyctl +++ b/prosodyctl @@ -41,6 +41,11 @@ prosody = { }; local prosody = prosody; +local dependencies = require "util.dependencies"; +if not dependencies.check_dependencies() then + os.exit(1); +end + config = require "core.configmanager" do @@ -94,9 +99,7 @@ config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } }); require "core.loggingmanager" -if not require "util.dependencies".check_dependencies() then - os.exit(1); -end +dependencies.log_warnings(); local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; require "util.datamanager".set_data_path(data_path); -- cgit v1.2.3