X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=404dc3eab0ada98b0c902db3105c6054fb988d7d;hb=2990fa609e95ed528478bfe79b7ffde345eb8799;hp=5f1b49b63b8b014d706b703c247f58611ecc24f3;hpb=05ed97dc877dd722abf46ca48e611f51d16e96dc;p=prosody.git

diff --git a/prosody b/prosody
index 5f1b49b6..404dc3ea 100755
--- a/prosody
+++ b/prosody
@@ -1,5 +1,5 @@
 #!/usr/bin/env lua
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -17,10 +17,13 @@ CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 -- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
 
 if CFG_SOURCEDIR then
-	package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
-	package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath
+	package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
+	package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
 end
 
+package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
+package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
+
 if CFG_DATADIR then
 	if os.getenv("HOME") then
 		CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
@@ -68,11 +71,38 @@ require "util.dependencies"
 --- Load socket framework
 local server = require "net.server"
 
+bare_sessions = {};
+full_sessions = {};
+hosts = {};
+
+-- Global 'prosody' object
+prosody = {};
+local prosody = prosody;
 
+prosody.bare_sessions = bare_sessions;
+prosody.full_sessions = full_sessions;
+prosody.hosts = hosts;
 
--- Maps connections to sessions --
-sessions = {};
-hosts = {};
+prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
+                  plugins = CFG_PLUGINDIR, data = CFG_DATADIR };
+
+prosody.arg = arg;
+
+prosody.events = require "util.events".new();
+
+-- Try to determine version
+local version_file = io.open((CFG_SOURCEDIR or ".").."/prosody.version");
+if version_file then
+	prosody.version = version_file:read("*a"):gsub("%s*$", "");
+	version_file:close();
+	if #prosody.version == 12 and prosody.version:match("^[a-f0-9]+$") then
+		prosody.version = "hg:"..prosody.version;
+	end
+else
+	prosody.version = "unknown";
+end
+
+log("info", "Hello and welcome to Prosody version %s", prosody.version);
 
 --- Load and initialise core modules
 require "util.import"
@@ -108,14 +138,48 @@ 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");
+require "util.datamanager".add_callback(function(username, host, datastore, data)
+	if config.get(host, "core", "anonymous_login") then
+		return false;
+	end
+	return username, host, datastore, data;
 end);
 
 ----------- End of out-of-place code --------------
 
+-- Function to reload the config file
+function prosody.reload_config()
+	log("info", "Reloading configuration file");
+	prosody.events.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
+
+-- 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
+	prosody.events.fire_event("reopen-log-files");
+end
+
+-- Function to initiate prosody shutdown
+function prosody.shutdown(reason)
+	log("info", "Shutting down: %s", reason or "unknown reason");
+	prosody.events.fire_event("server-stopping", {reason = reason});
+	server.setquitting(true);
+end
+
+-- Signal to modules that we are ready 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"; };
@@ -137,7 +201,9 @@ function net_activate_ports(option, listener, default, conntype)
 				cl.start(listener, { 
 					ssl = conntype ~= "tcp" and global_ssl_ctx,
 					port = port,
-					interface = config.get("*", "core", option.."_interface"),
+					interface = config.get("*", "core", option.."_interface") 
+						or cl.get(listener).default_interface 
+						or config.get("*", "core", "interface"),
 					type = conntype
 				});
 			end
@@ -147,38 +213,31 @@ 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 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
-end
-
--- 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);
+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()
+function prosody.unlock_globals()
 	setmetatable(_G, nil);
 end
 
-function lock_globals()
+function prosody.lock_globals()
 	setmetatable(_G, locked_globals_mt);
 end
 
 -- And lock now...
-lock_globals();
+prosody.lock_globals();
+
+prosody.start_time = os.time();
 
 eventmanager.fire_event("server-started");
+prosody.events.fire_event("server-started");
 
 -- Error handler for errors that make it this far
 local function catch_uncaught_error(err)
@@ -192,20 +251,23 @@ local function catch_uncaught_error(err)
 		log("error", "%s", traceback);
 	end
 	
-	eventmanager.fire_event("very-bad-error", "*", err, traceback);
+	prosody.events.fire_event("very-bad-error", {error = err, traceback = traceback});
 end
 
 while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do
 	socket.sleep(0.2);
 end
 
-eventmanager.fire_event("server-cleanup");
+log("info", "Shutdown status: Cleaning up");
+prosody.events.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
@@ -215,6 +277,7 @@ for hostname, host in pairs(hosts) do
 		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
@@ -226,6 +289,11 @@ for hostname, host in pairs(hosts) do
 	end
 end
 
+log("info", "Shutdown status: Closing all server connections");
 server.closeall();
 
+server.setquitting(true);
+
 eventmanager.fire_event("server-stopped");
+prosody.events.fire_event("server-stopped");
+log("info", "Shutdown status: Complete!");