prosody, stanza_router: Load stanza_router earlier. Put routing functions in the...

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 50044766da1eb4fbdf6df6b1ebfe80b577327775..6e8ac6b38f08e78ba5f28a9551a8eba964dd7075 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -204,3 +204,6 @@ function core_route_stanza(origin, stanza)
                end
        end
 end
+prosody.core_process_stanza = core_process_stanza;
+prosody.core_post_stanza = core_post_stanza;
+prosody.core_route_stanza = core_route_stanza;

diff --git a/prosody b/prosody
index 64021fd32f2548ce4ac65417229e957cebcf7109..52488639c62f7b588c5e6eae5f68a92642a25aad 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -279,12 +279,12 @@ function load_secondary_libraries()
        require "util.import"
        require "util.xmppstream"
        require "core.rostermanager"
+       require "core.stanza_router"
        require "core.hostmanager"
        require "core.portmanager"
        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[ \t]*([^\n]*)"));
                return function() end