prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeye...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index dddfaacf61f58500998e22d55f641fe22b521139..df7ce9fb9154da83622aaee785d8889a068ccc4c 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -32,29 +32,6 @@ if CFG_DATADIR then
        end
 end
 
--- Required to be able to find packages installed with luarocks
-pcall(require, "luarocks.require");
-
--- Replace require() with one that doesn't pollute _G, required
--- for neat sandboxing of modules
-do
-       local _realG = _G;
-       local _real_require = require;
-       function require(...)
-               local curr_env = getfenv(2);
-               local curr_env_mt = getmetatable(getfenv(2));
-               local _realG_mt = getmetatable(_realG);
-               if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then
-                       local old_newindex
-                       old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
-                       local ret = _real_require(...);
-                       _realG_mt.__newindex = old_newindex;
-                       return ret;
-               end
-               return _real_require(...);
-       end
-end
-
 -- Load the config-parsing module
 config = require "core.configmanager"
 
@@ -110,16 +87,42 @@ function read_config()
 end
 
 function load_libraries()
-       -- Initialize logging
-       require "core.loggingmanager"
-       
-       -- Check runtime dependencies
-       require "util.dependencies"
-       
        -- Load socket framework
        server = require "net.server"
 end    
 
+function init_logging()
+       -- Initialize logging
+       require "core.loggingmanager"
+end
+
+function check_dependencies()
+       -- Check runtime dependencies
+       if not require "util.dependencies".check_dependencies() then
+               os.exit(1);
+       end
+end
+
+function sandbox_require()
+       -- Replace require() with one that doesn't pollute _G, required
+       -- for neat sandboxing of modules
+       local _realG = _G;
+       local _real_require = require;
+       function require(...)
+               local curr_env = getfenv(2);
+               local curr_env_mt = getmetatable(getfenv(2));
+               local _realG_mt = getmetatable(_realG);
+               if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then
+                       local old_newindex
+                       old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
+                       local ret = _real_require(...);
+                       _realG_mt.__newindex = old_newindex;
+                       return ret;
+               end
+               return _real_require(...);
+       end
+end
+
 function init_global_state()
        bare_sessions = {};
        full_sessions = {};
@@ -202,17 +205,41 @@ function init_global_state()
                        log("error", "core."..ports_option.." is not a table");
                else
                        for _, port in ipairs(ports) do
+                               port = tonumber(port);
                                if type(port) ~= "number" then
                                        log("error", "Non-numeric "..ports_option..": "..tostring(port));
                                else
-                                       cl.start(listener, { 
-                                               ssl = conntype ~= "tcp" and global_ssl_ctx,
+                                       local ok, err = cl.start(listener, {
+                                               ssl = conntype == "ssl" and global_ssl_ctx,
                                                port = port,
                                                interface = (option and config.get("*", "core", option.."_interface"))
                                                        or cl.get(listener).default_interface
                                                        or config.get("*", "core", "interface"),
                                                type = conntype
                                        });
+                                       if not ok then
+                                               local friendly_message = err;
+                                               if err:match(" in use") then
+                                                       if port == 5222 or port == 5223 or port == 5269 then
+                                                               friendly_message = "check that Prosody or another XMPP server is "
+                                                                       .."not already running and using this port";
+                                                       elseif port == 80 or port == 81 then
+                                                               friendly_message = "check that a HTTP server is not already using "
+                                                                       .."this port";
+                                                       elseif port == 5280 then
+                                                               friendly_message = "check that Prosody or a BOSH connection manager "
+                                                                       .."is not already running";
+                                                       else
+                                                               friendly_message = "this port is in use by another application";
+                                                       end
+                                               elseif err:match("permission") then
+                                                       friendly_message = "Prosody does not have sufficient privileges to use this port";
+                                               elseif err == "no ssl context" then
+                                                       friendly_message = "there is no 'ssl' config under Host \"*\" which is "
+                                                               .."require for legacy SSL ports";
+                                               end
+                                               log("error", "Failed to open server port %d, %s", port, friendly_message);
+                                       end
                                end
                        end
                end
@@ -294,7 +321,7 @@ function prepare_to_start()
        else
                prosody.net_activate_ports("c2s", "xmppclient", {5222});
                prosody.net_activate_ports("s2s", "xmppserver", {5269});
-               prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp");
+               prosody.net_activate_ports("component", "xmppcomponent", {5347}, "tcp");
                prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
        end
 
@@ -384,7 +411,12 @@ function cleanup()
 end
 
 -- Are you ready? :)
+-- These actions are in a strict order, as many depend on
+-- previous steps to have already been performed
 read_config();
+init_logging();
+check_dependencies();
+sandbox_require();
 load_libraries();
 init_global_state();
 read_version();