projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xmppcomponent_listener: Switch to util.xmppstream from xmlhandlers
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 8e96eb46ac88d1cfdc42bf146a0570928686bd17..7bc075d746a0de6890f12507a8aaa76fb9ea1b3c 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-144,6
+144,10
@@
function set_function_metatable()
debug.setupvalue(f, i, value);
end
end
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
debug.setmetatable(function() end, mt);
end
@@
-281,6
+285,7
@@
end
function load_secondary_libraries()
--- Load and initialise core modules
require "util.import"
function load_secondary_libraries()
--- Load and initialise core modules
require "util.import"
+ require "util.xmppstream"
require "core.xmlhandlers"
require "core.rostermanager"
require "core.hostmanager"
require "core.xmlhandlers"
require "core.rostermanager"
require "core.hostmanager"
@@
-288,6
+293,10
@@
function load_secondary_libraries()
require "core.usermanager"
require "core.sessionmanager"
require "core.stanza_router"
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"
require "net.http"
@@
-321,6
+330,7
@@
function init_data_store()
end
return username, host, datastore, data;
end);
end
return username, host, datastore, data;
end);
+ require "core.storagemanager";
end
function prepare_to_start()
end
function prepare_to_start()