X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=2febe4d8b7f0dd920ff601d1b80f0d1e0e99b384;hb=34215744d79b2fcf146b69a59007d104085dff4a;hp=58ebc16a09afb83876e10d030ae046ccdb47bbf7;hpb=4c57f0f5238c4918bf208a437858536f6cd63315;p=prosody.git diff --git a/prosody b/prosody index 58ebc16a..2febe4d8 100755 --- a/prosody +++ b/prosody @@ -1,135 +1,258 @@ #!/usr/bin/env lua +-- Prosody IM v0.4 +-- Copyright (C) 2008-2009 Matthew Wild +-- Copyright (C) 2008-2009 Waqas Hussain +-- +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. +-- --- Config here -- +-- Will be modified by configure script if run -- CFG_SOURCEDIR=nil; -CFG_CONFIGDIR=nil; +CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); CFG_PLUGINDIR=nil; +CFG_DATADIR=os.getenv("PROSODY_DATADIR"); --- -- -- -- -- -- +-- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- -- if CFG_SOURCEDIR then - if os.getenv("HOME") then - CFG_SOURCEDIR = CFG_SOURCEDIR:gsub("^~", os.getenv("HOME")); - end package.path = CFG_SOURCEDIR.."/?.lua;"..package.path package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath end -if CFG_CONFIGDIR then +if CFG_DATADIR then if os.getenv("HOME") then - CFG_CONFIGDIR = CFG_CONFIGDIR:gsub("^~", os.getenv("HOME")); + CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); end -end - -if CFG_PLUGINDIR then - if os.getenv("HOME") then - CFG_PLUGINDIR = CFG_PLUGINDIR:gsub("^~", os.getenv("HOME")); - end -end +end -- Required to be able to find packages installed with luarocks pcall(require, "luarocks.require") config = require "core.configmanager" -log = require "util.logger".init("general"); do -- TODO: Check for other formats when we add support for them -- Use lfs? Make a new conf/ dir? - local ok, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); if not ok then - log("error", "Couldn't load config file: %s", err); - log("info", "Falling back to old config file format...") - ok, err = pcall(dofile, "lxmppd.cfg"); - if not ok then - log("error", "Old config format loading failed too: %s", err); - else - for _, host in ipairs(_G.config.hosts) do - config.set(host, "core", "defined", true); - end - - config.set("*", "core", "modules_enabled", _G.config.modules); - config.set("*", "core", "ssl", _G.config.ssl_ctx); + print("\n"); + print("**************************"); + if level == "parser" then + print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)"); + print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err))); + print(""); + elseif level == "file" then + print("Prosody was unable to find the configuration file."); + print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist"); + print("Copy or rename it to prosody.cfg.lua and edit as necessary."); end + print("More help on configuring Prosody can be found at http://prosody.im/doc/configure"); + print("Good luck!"); + print("**************************"); + print(""); + os.exit(1); end end -require "util.datamanager".set_data_path(config.get("*", "core", "data_path") or "data"); +--- Initialize logging +require "core.loggingmanager" +--- Check runtime dependencies +require "util.dependencies" + +--- Load socket framework local server = require "net.server" -require "util.dependencies" + -- Maps connections to sessions -- sessions = {}; hosts = {}; -local defined_hosts = config.getconfig(); - -for host, host_config in pairs(defined_hosts) do - if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then - hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} }; - end -end - --- Load and initialise core modules -- - +--- Load and initialise core modules require "util.import" require "core.xmlhandlers" require "core.rostermanager" -require "core.offlinemessage" +require "core.eventmanager" +require "core.hostmanager" require "core.modulemanager" 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 +--[[ pcall(require, "remdebug.engine"); if remdebug then remdebug.engine.start() end ]] -local start = require "net.connlisteners".start; +local cl = require "net.connlisteners"; + require "util.stanza" require "util.jid" ------------------------------------------------------------------------ --- Initialise modules -for host in pairs(hosts) do - if host ~= "*" then - local modules_enabled = config.get(host, "core", "modules_enabled"); - if modules_enabled then - for _, module in pairs(modules_enabled) do - modulemanager.load(host, module); - end +------------- Begin code without a home --------------------- + +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 --- setup error handling -setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][]; +-- 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 -local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end; -local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end 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 +-- 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 -start("xmppclient", { ssl = global_ssl_ctx }) -start("xmppserver", { ssl = global_ssl_ctx }) +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"), + 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 + +-- 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(); -if config.get("*", "core", "console_enabled") then - start("console") +eventmanager.fire_event("server-started"); + +-- 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 -modulemanager.fire_event("server-started"); +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); -server.loop(); +eventmanager.fire_event("server-stopped"); +log("info", "Shutdown status: Complete!");