X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=290aa874a2fa3ef61f34b3dd2dd78703d19d0d63;hb=878ea13410accd4832a5b7303ae4f5a08b790622;hp=cd8816b19f0ba46b23d6acdef78731e56a27653e;hpb=02349b337b5d724316d1830cfc433bcb5bc43cef;p=prosody.git

diff --git a/prosody b/prosody
index cd8816b1..290aa874 100755
--- a/prosody
+++ b/prosody
@@ -68,9 +68,39 @@ 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;
+
+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"
 require "core.xmlhandlers"
@@ -105,16 +135,19 @@ 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()
+function prosody.reload_config()
 	log("info", "Reloading configuration file");
-	eventmanager.fire_event("reloading-config");
+	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
@@ -126,20 +159,22 @@ function prosody_reload_config()
 end
 
 -- Function to reopen logfiles
-function prosody_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)
+function prosody.shutdown(reason)
 	log("info", "Shutting down: %s", reason or "unknown reason");
-	eventmanager.fire_event("server-stopping", { reason = 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");
@@ -163,7 +198,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
@@ -183,18 +220,19 @@ 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();
 
 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)
@@ -208,7 +246,7 @@ 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
@@ -216,7 +254,7 @@ while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do
 end
 
 log("info", "Shutdown status: Cleaning up");
-eventmanager.fire_event("server-cleanup");
+prosody.events.fire_event("server-cleanup");
 
 -- Ok, we're quitting I know, but we
 -- need to do some tidying before we go :)
@@ -252,4 +290,5 @@ server.closeall();
 server.setquitting(true);
 
 eventmanager.fire_event("server-stopped");
+prosody.events.fire_event("server-stopped");
 log("info", "Shutdown status: Complete!");