mod_presence: Don't depend on sessions array existing for a user when handling outgoi...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index ae9cd2fc5438fa2569b416446cabb1d3661e90d3..65d8dceb17201bae80e1663207df8c4b6e1f2d6e 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -14,7 +14,7 @@ CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
 CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
--- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
+-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
 if CFG_SOURCEDIR then
        package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
@@ -58,7 +58,27 @@ config = require "core.configmanager"
 function read_config()
        -- TODO: Check for other formats when we add support for them
        -- Use lfs? Make a new conf/ dir?
-       local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+       local filenames = {};
+       
+       local filename;
+       if arg[1] == "--config" and arg[2] then
+               table.insert(filenames, arg[2]);
+               if CFG_CONFIGDIR then
+                       table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
+               end
+       else
+               table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+       end
+       for _,_filename in ipairs(filenames) do
+               filename = _filename;
+               local file = io.open(filename);
+               if file then
+                       file:close();
+                       CFG_CONFIGDIR = filename:match("^(.*)[\\/][^\\/]*$");
+                       break;
+               end
+       end
+       local ok, level, err = config.load(filename);
        if not ok then
                print("\n");
                print("**************************");
@@ -82,13 +102,13 @@ function read_config()
 end
 
 function load_libraries()
-       --- Initialize logging
+       -- Initialize logging
        require "core.loggingmanager"
        
-       --- Check runtime dependencies
+       -- Check runtime dependencies
        require "util.dependencies"
        
-       --- Load socket framework
+       -- Load socket framework
        server = require "net.server"
 end    
 
@@ -175,7 +195,7 @@ function init_global_state()
                                if type(port) ~= "number" then
                                        log("error", "Non-numeric "..option.."_ports: "..tostring(port));
                                else
-                                       cl.start(listener, { 
+                                       local ok, err = cl.start(listener, {
                                                ssl = conntype ~= "tcp" and global_ssl_ctx,
                                                port = port,
                                                interface = config.get("*", "core", option.."_interface") 
@@ -183,6 +203,29 @@ function init_global_state()
                                                        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
@@ -257,15 +300,18 @@ function prepare_to_start()
        -- start listening on sockets
        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");
 
        prosody.start_time = os.time();
 end    
 
 function init_global_protection()
-       -- Catch global accesses --
-       local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }
+       -- Catch global accesses
+       local locked_globals_mt = {
+               __index = function (t, k) log("warn", "%s", debug.traceback("Attempt to read a non-existent global '"..tostring(k).."'", 2)); end;
+               __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end;
+       };
                
        function prosody.unlock_globals()
                setmetatable(_G, nil);