mod_storage_sql: Dynamically replace backquotes with double quotes when connecting...

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index c7ef93edb385d0e7401bc5258437b19719044bdb..9630a9b8089280e5e7f3f7d79989b3b0b9f7f2a6 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -33,12 +33,19 @@ end
 
 -- Global 'prosody' object
 prosody = {
-       hosts = {},
-       events = require "util.events".new(),
-       platform = "posix"
+       hosts = {};
+       events = require "util.events".new();
+       platform = "posix";
+       lock_globals = function () end;
+       unlock_globals = function () end;
 };
 local prosody = prosody;
 
+local dependencies = require "util.dependencies";
+if not dependencies.check_dependencies() then
+       os.exit(1);
+end
+
 config = require "core.configmanager"
 
 do
@@ -92,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);
@@ -329,7 +334,7 @@ function commands.adduser(arg)
        
        if ok then return 0; end
        
-       show_message(error_messages[msg])
+       show_message(msg)
        return 1;
 end