X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=671910df199df677d8ad7121221565bc01ef417c;hb=1bf13c7d738fee0ac2e486297c4dbb285f4ca310;hp=8e96eb46ac88d1cfdc42bf146a0570928686bd17;hpb=fb3f3f7c252ba97752f48aca9ad254476643c421;p=prosody.git

diff --git a/prosody b/prosody
index 8e96eb46..671910df 100755
--- a/prosody
+++ b/prosody
@@ -144,6 +144,10 @@ function set_function_metatable()
 			debug.setupvalue(f, i, value);
 		end
 	end
+	function mt.__tostring(f)
+		local info = debug.getinfo(f);
+		return ("function(%s:%d)"):format(info.short_src:match("[^\\/]*$"), info.linedefined);
+	end
 	debug.setmetatable(function() end, mt);
 end
 
@@ -281,13 +285,17 @@ end
 function load_secondary_libraries()
 	--- Load and initialise core modules
 	require "util.import"
-	require "core.xmlhandlers"
+	require "util.xmppstream"
 	require "core.rostermanager"
 	require "core.hostmanager"
 	require "core.modulemanager"
 	require "core.usermanager"
 	require "core.sessionmanager"
 	require "core.stanza_router"
+	package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
+		log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[\s\t]*([^\n]*)"));
+		return function() end
+	end});
 
 	require "net.http"
 	
@@ -321,6 +329,7 @@ function init_data_store()
 		end
 		return username, host, datastore, data;
 	end);
+	require "core.storagemanager";
 end
 
 function prepare_to_start()