tools/ejabberd2prosody: Fixed private storage export
[prosody.git] / prosody
diff --git a/prosody b/prosody
index 15c94c92f5404304828f820c7f612807eb82b239..2febe4d8b7f0dd920ff601d1b80f0d1e0e99b384 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -1,5 +1,5 @@
 #!/usr/bin/env lua
--- Prosody IM v0.3
+-- Prosody IM v0.4
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -32,17 +32,13 @@ pcall(require, "luarocks.require")
 
 
 config = require "core.configmanager"
-log = require "util.logger".init("general");
-
--- Disable log output, needs to read from config
--- require "util.logger".setwriter(function () end);
 
 do
        -- 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");
        if not ok then
-               print("");
+               print("\n");
                print("**************************");
                if level == "parser" then
                        print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
@@ -63,17 +59,22 @@ do
        end
 end
 
+--- Initialize logging
+require "core.loggingmanager"
+
+--- Check runtime dependencies
 require "util.dependencies"
 
+--- Load socket framework
 local server = require "net.server"
 
 
+
 -- Maps connections to sessions --
 sessions = {};
 hosts = {};
 
--- Load and initialise core modules --
-
+--- Load and initialise core modules
 require "util.import"
 require "core.xmlhandlers"
 require "core.rostermanager"
@@ -84,6 +85,10 @@ require "core.usermanager"
 require "core.sessionmanager"
 require "core.stanza_router"
 
+require "util.array"
+require "util.iterators"
+require "util.timer"
+
 -- Commented to protect us from 
 -- the second kind of people
 --[[ 
@@ -103,69 +108,151 @@ require "util.jid"
 
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
 require "util.datamanager".set_data_path(data_path);
+require "util.datamanager".set_callback(function(username, host, datastore)
+       return config.get(host, "core", "anonymous_login");
+end);
 
 ----------- End of out-of-place code --------------
 
+-- Function to reload the config file
+function prosody_reload_config()
+       log("info", "Reloading configuration file");
+       eventmanager.fire_event("reloading-config");
+       local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua");
+       if not ok then
+               if level == "parser" then
+                       log("error", "There was an error parsing the configuration file: %s", tostring(err));
+               elseif level == "file" then
+                       log("error", "Couldn't read the config file when trying to reload: %s", tostring(err));
+               end
+       end
+end
 
-eventmanager.fire_event("server-starting");
+-- Function to reopen logfiles
+function prosody_reopen_logfiles()
+       log("info", "Re-opening log files");
+       eventmanager.fire_event("reopen-log-files"); -- Handled by appropriate log sinks
+end
 
+-- Function to initiate prosody shutdown
+function prosody_shutdown(reason)
+       log("info", "Shutting down: %s", reason or "unknown reason");
+       eventmanager.fire_event("server-stopping", { reason = reason });
+       server.setquitting(true);
+end
 
--- setup error handling
-setmetatable(_G, { __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 });
+-- Signal to modules that we are ready to start
+eventmanager.fire_event("server-starting");
 
-local global_ssl_ctx = config.get("*", "core", "ssl");
+-- 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
 
 -- start listening on sockets
-local function do_ports(option, listener, default, conntype)
-       local ports = config.get("*", "core", option) or default;
-       --if type(ports) == "number" then ports = {ports} end;
+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..": "..tostring(port));
+                               log("error", "Non-numeric "..option.."_ports: "..tostring(port));
                        else
-                               cl.start(listener, { ssl = conntype ~= "tcp" and global_ssl_ctx, port = port, type = conntype });
+                               cl.start(listener, { 
+                                       ssl = conntype ~= "tcp" and global_ssl_ctx,
+                                       port = port,
+                                       interface = config.get("*", "core", option.."_interface"),
+                                       type = conntype
+                               });
                        end
                end
        end
 end
 
-do_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
-do_ports("s2s_ports", "xmppserver", {5269}, "tcp");
-do_ports("legacy_ssl_ports", "xmppclient", {}, "ssl");
+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 config.get("*", "core", "console_enabled") then
-       if cl.get("console") then
-               cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" })
-       else
-               log("error", "Console is enabled, but the console module appears not to be loaded");
-       end
+if cl.get("console") then
+       cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" })
 end
 
+-- 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 }
+
+function unlock_globals()
+       setmetatable(_G, nil);
+end
+
+function lock_globals()
+       setmetatable(_G, locked_globals_mt);
+end
+
+-- And lock now...
+lock_globals();
+
 eventmanager.fire_event("server-started");
 
-local quitting;
-while not quitting do
-       xpcall(server.loop, function (err)
-                                       if err:match("%d*: interrupted!$") then
-                                               quitting = true;
-                                               return;
-                                       end
-
-                                       log("error", "Top-level error, please report:\n%s", tostring(err));
-
-                                       local traceback = debug.traceback("", 2);
-                                       if traceback then
-                                               log("error", "%s", traceback);
-                                       end
-                                       
-                                       eventmanager.fire_event("very-bad-error", "*", err, traceback);
-                               end);
+-- Error handler for errors that make it this far
+local function catch_uncaught_error(err)
+       if err:match("%d*: interrupted!$") then
+               return "quitting";
+       end
+       
+       log("error", "Top-level error, please report:\n%s", tostring(err));
+       local traceback = debug.traceback("", 2);
+       if traceback then
+               log("error", "%s", traceback);
+       end
+       
+       eventmanager.fire_event("very-bad-error", "*", err, traceback);
 end
+
+while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do
+       socket.sleep(0.2);
+end
+
+log("info", "Shutdown status: Cleaning up");
+eventmanager.fire_event("server-cleanup");
+
+-- Ok, we're quitting I know, but we
+-- need to do some tidying before we go :)
+server.setquitting(false);
+
+log("info", "Shutdown status: Closing all active sessions");
+for hostname, host in pairs(hosts) do
+       log("debug", "Shutdown status: Closing client connections for %s", hostname)
+       if host.sessions then
+               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");
+                       end
+               end
+       end
+       
+       log("debug", "Shutdown status: Closing outgoing s2s connections from %s", hostname);
+       if host.s2sout then
+               for remotehost, session in pairs(host.s2sout) do
+                       if session.close then
+                               session:close("system-shutdown");
+                       else
+                               log("warn", "Unable to close outgoing s2s session to %s, no session:close()?!", remotehost);
+                       end
+               end
+       end
+end
+
+log("info", "Shutdown status: Closing all server connections");
+server.closeall();
+
+server.setquitting(true);
+
+eventmanager.fire_event("server-stopped");
+log("info", "Shutdown status: Complete!");