-- 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");
end
end
-log = require "util.logger".init("general");
-
--- Disable log output, needs to read from config
--- require "util.logger".setwriter(function () 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"
require "util.array"
require "util.iterators"
+require "util.timer"
-- Commented to protect us from
-- the second kind of people
-- start listening on sockets
function net_activate_ports(option, listener, default, conntype)
- local ports = config.get("*", "core", option) or default;
+ local ports = config.get("*", "core", option.."_ports") or default;
if type(ports) == "number" then ports = {ports} end;
if type(ports) ~= "table" then
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
-net_activate_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
-net_activate_ports("s2s_ports", "xmppserver", {5269}, "tcp");
-net_activate_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("legacy_ssl", "xmppclient", {}, "ssl");
if config.get("*", "core", "console_enabled") then
if cl.get("console") then
end
end
--- setup error handling
+-- Global 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
+
+-- 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, 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
+
+eventmanager.fire_event("server-cleanup");
+
+-- Ok, we're quitting I know, but we
+-- need to do some tidying before we go :)
+server.setquitting(false);
+
+for hostname, host in pairs(hosts) do
+ 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
+
+ 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
+
+server.closeall();
+
+eventmanager.fire_event("server-stopped");
projects / prosody.git / blobdiff