mod_tls: Only negotiate TLS on outgoing s2s connections if we have an SSL context...

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 00e67bd9bc2f07bf80cffb0a4c9be7e48c3d561f..9d2df69ede44490de53a6b36dca856aa04595638 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -29,14 +29,6 @@ if CFG_DATADIR then
        end
 end
 
-if not require "util.dependencies".check_dependencies() then
-       os.exit(1);
-end
-
--- Required to be able to find packages installed with luarocks
-pcall(require, "luarocks.require")
-
-
 config = require "core.configmanager"
 
 do
@@ -65,6 +57,12 @@ do
        end
 end
 
+require "core.loggingmanager"
+
+if not require "util.dependencies".check_dependencies() then
+       os.exit(1);
+end
+
 prosody = { hosts = {}, events = events, platform = "posix" };
 
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
@@ -341,21 +339,23 @@ function commands.start(arg)
        
        local ok, ret = prosodyctl.start();
        if ok then
-               local i=1;
-               while true do
-                       local ok, running = prosodyctl.isrunning();
-                       if ok and running then
-                               break;
-                       elseif i == 5 then
-                               show_message("Still waiting...");
-                       elseif i >= prosodyctl_timeout then
-                               show_message("Prosody is still not running. Please give it some time or check your log files for errors.");
-                               return 2;
+               if config.get("*", "core", "daemonize") ~= false then
+                       local i=1;
+                       while true do
+                               local ok, running = prosodyctl.isrunning();
+                               if ok and running then
+                                       break;
+                               elseif i == 5 then
+                                       show_message("Still waiting...");
+                               elseif i >= prosodyctl_timeout then
+                                       show_message("Prosody is still not running. Please give it some time or check your log files for errors.");
+                                       return 2;
+                               end
+                               socket.sleep(0.5);
+                               i = i + 1;
                        end
-                       socket.sleep(0.5);
-                       i = i + 1;
+                       show_message("Started");
                end
-               show_message("Started");
                return 0;
        end