prosody: Added a stub implementation of core.componentmanager to the package.loaded...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 88620b38fc8efa7ae7ff1e79c600de44957b38f9..7bc075d746a0de6890f12507a8aaa76fb9ea1b3c 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -285,6 +285,7 @@ end
 function load_secondary_libraries()
        --- Load and initialise core modules
        require "util.import"
+       require "util.xmppstream"
        require "core.xmlhandlers"
        require "core.rostermanager"
        require "core.hostmanager"
@@ -292,6 +293,10 @@ function load_secondary_libraries()
        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"
        
@@ -325,10 +330,11 @@ function init_data_store()
                end
                return username, host, datastore, data;
        end);
+       require "core.storagemanager";
 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");