Update rostermanager to use new logger

[prosody.git] / main.lua

diff --git a/main.lua b/main.lua
index 2dd1a1d9373d09e5d65ae147023f10a10aaa4c96..a9154d439f5f302d5fe789dc6b263eb595f57d37 100644 (file)
--- a/main.lua
+++ b/main.lua
@@ -17,7 +17,7 @@ hosts = {};
 
 if config.hosts and #config.hosts > 0 then
        for _, host in pairs(config.hosts) do
-               hosts[host] = {type = "local", connected = true, sessions = {}, host = host};
+               hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
        end
 else error("No hosts defined in the configuration file"); end
 
@@ -32,6 +32,9 @@ require "core.usermanager"
 require "core.sessionmanager"
 require "core.stanza_router"
 
+pcall(require, "remdebug.engine");
+if remdebug then remdebug.engine.start() end
+
 local start = require "net.connlisteners".start;
 require "util.stanza"
 require "util.jid"
@@ -41,9 +44,7 @@ require "util.jid"
 -- Initialise modules
 if config.modules and #config.modules > 0 then
        for _, module in pairs(config.modules) do
-               if not modulemanager.load(module) then
-                       error("Unable to load module "..module);
-               end
+               modulemanager.load(module);
        end
 else error("No modules enabled in the configuration file"); end