util.signal: Queue up multiple signals, instead of trampling on the previous debug...
[prosody.git] / prosody
diff --git a/prosody b/prosody
index 4e9ab2cc27a18c173e2a591b74996b731fa3f16a..e4e5bc4789aede119051e0e53ee3687c2b4e1a26 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -9,12 +9,12 @@
 
 -- Will be modified by configure script if run --
 
-CFG_SOURCEDIR=nil;
+CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=nil;
+CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
--- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
+-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
 if CFG_SOURCEDIR then
        package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
@@ -33,13 +33,52 @@ end
 -- Required to be able to find packages installed with luarocks
 pcall(require, "luarocks.require")
 
+-- Replace require with one that doesn't pollute _G
+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
+
 
 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("**************************");
@@ -63,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    
 
@@ -93,6 +132,17 @@ function init_global_state()
 
        prosody.events = require "util.events".new();
        
+       prosody.platform = "unknown";
+       if os.getenv("WINDIR") then
+               prosody.platform = "windows";
+       elseif package.config:sub(1,1) == "/" then
+               prosody.platform = "posix";
+       end
+       
+       prosody.installed = nil;
+       if CFG_SOURCEDIR and (prosody.platform == "windows" or CFG_SOURCEDIR:match("^/")) then
+               prosody.installed = true;
+       end
        
        -- Function to reload the config file
        function prosody.reload_config()
@@ -119,9 +169,45 @@ function init_global_state()
        -- Function to initiate prosody shutdown
        function prosody.shutdown(reason)
                log("info", "Shutting down: %s", reason or "unknown reason");
+               prosody.shutdown_reason = reason;
                prosody.events.fire_event("server-stopping", {reason = reason});
                server.setquitting(true);
        end
+
+       -- Load SSL settings from config, and create a ctx table
+       local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl");
+       if global_ssl_ctx then
+               local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
+               setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
+       end
+
+       local cl = require "net.connlisteners";
+       function prosody.net_activate_ports(option, listener, default, conntype)
+               conntype = conntype or (global_ssl_ctx and "tls") or "tcp";
+               if not cl.get(listener) then return; end
+               local ports = config.get("*", "core", option.."_ports") or default;
+               if type(ports) == "number" then ports = {ports} end;
+               
+               if type(ports) ~= "table" then
+                       log("error", "core."..option.." is not a table");
+               else
+                       for _, port in ipairs(ports) do
+                               port = tonumber(port);
+                               if type(port) ~= "number" then
+                                       log("error", "Non-numeric "..option.."_ports: "..tostring(port));
+                               else
+                                       cl.start(listener, { 
+                                               ssl = conntype ~= "tcp" 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
+                                       });
+                               end
+                       end
+               end
+       end
 end
 
 function read_version()
@@ -150,11 +236,16 @@ function load_secondary_libraries()
        require "core.sessionmanager"
        require "core.stanza_router"
 
+       require "net.http"
+       
        require "util.array"
+       require "util.datetime"
        require "util.iterators"
        require "util.timer"
        require "util.helpers"
        
+       pcall(require, "util.signal") -- Not on Windows
+       
        -- Commented to protect us from 
        -- the second kind of people
        --[[ 
@@ -184,47 +275,11 @@ function prepare_to_start()
        eventmanager.fire_event("server-starting");
        prosody.events.fire_event("server-starting");
 
-       -- Load SSL settings from config, and create a ctx table
-       local global_ssl_ctx = ssl and config.get("*", "core", "ssl");
-       if global_ssl_ctx then
-               local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
-               setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
-       end
-
-       local cl = require "net.connlisteners";
        -- start listening on sockets
-       function net_activate_ports(option, listener, default, conntype)
-               local ports = config.get("*", "core", option.."_ports") or default;
-               if type(ports) == "number" then ports = {ports} end;
-               
-               if type(ports) ~= "table" then
-                       log("error", "core."..option.." is not a table");
-               else
-                       for _, port in ipairs(ports) do
-                               if type(port) ~= "number" then
-                                       log("error", "Non-numeric "..option.."_ports: "..tostring(port));
-                               else
-                                       cl.start(listener, { 
-                                               ssl = conntype ~= "tcp" and global_ssl_ctx,
-                                               port = port,
-                                               interface = config.get("*", "core", option.."_interface") 
-                                                       or cl.get(listener).default_interface 
-                                                       or config.get("*", "core", "interface"),
-                                               type = conntype
-                                       });
-                               end
-                       end
-               end
-       end
-
-       net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
-       net_activate_ports("s2s", "xmppserver", {5269}, "tcp");
-       net_activate_ports("component", "xmppcomponent", {}, "tcp");
-       net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
-       
-       if cl.get("console") then
-               cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" })
-       end
+       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("legacy_ssl", "xmppclient", {}, "ssl");
 
        prosody.start_time = os.time();
 end    
@@ -248,7 +303,7 @@ end
 function loop()
        -- Error handler for errors that make it this far
        local function catch_uncaught_error(err)
-               if err:match("%d*: interrupted!$") then
+               if type(err) == "string" and err:match("interrupted!$") then
                        return "quitting";
                end
                
@@ -278,10 +333,14 @@ function cleanup()
        for hostname, host in pairs(hosts) do
                log("debug", "Shutdown status: Closing client connections for %s", hostname)
                if host.sessions then
+                       local reason = { condition = "system-shutdown", text = "Server is shutting down" };
+                       if prosody.shutdown_reason then
+                               reason.text = reason.text..": "..prosody.shutdown_reason;
+                       end
                        for username, user in pairs(host.sessions) do
                                for resource, session in pairs(user.sessions) do
                                        log("debug", "Closing connection for %s@%s/%s", username, hostname, resource);
-                                       session:close("system-shutdown");
+                                       session:close(reason);
                                end
                        end
                end
@@ -311,8 +370,8 @@ read_version();
 log("info", "Hello and welcome to Prosody version %s", prosody.version);
 load_secondary_libraries();
 init_data_store();
-prepare_to_start();
 init_global_protection();
+prepare_to_start();
 
 eventmanager.fire_event("server-started");
 prosody.events.fire_event("server-started");