projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/xep227toprosody.lua: Convert to use util.xmppstream
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 517762f3c438d4d7061739f7a8f3ec95e86d3175..7bc075d746a0de6890f12507a8aaa76fb9ea1b3c 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-293,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"
@@
-326,10
+330,11
@@
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()
- log("
debug
", "Prosody is using the %s backend for connection handling", server.get_backend());
+ log("
info
", "Prosody is using the %s backend for connection handling", server.get_backend());
-- Signal to modules that we are ready to start
prosody.events.fire_event("server-starting");
-- Signal to modules that we are ready to start
prosody.events.fire_event("server-starting");