Update rostermanager to use new logger

[prosody.git] / main.lua

diff --git a/main.lua b/main.lua
index b8a15adf6a9a6bbc39f9c2e9cb245beb4e38f152..a9154d439f5f302d5fe789dc6b263eb595f57d37 100644 (file)
--- a/main.lua
+++ b/main.lua
@@ -1,19 +1,29 @@
-require "luarocks.require"
+pcall(require, "luarocks.require")
 
-server = require "net.server"
+local server = require "net.server"
+require "lxp"
 require "socket"
 require "ssl"
-require "lxp"
 
 function log(type, area, message)
        print(type, area, message);
 end
 
 dofile "lxmppd.cfg"
- 
+
+-- Maps connections to sessions --
 sessions = {};
- 
-require "core.stanza_dispatch"
+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, s2sout = {} };
+       end
+else error("No hosts defined in the configuration file"); end
+
+-- Load and initialise core modules --
+
+require "util.import"
 require "core.xmlhandlers"
 require "core.rostermanager"
 require "core.offlinemessage"
@@ -21,87 +31,31 @@ require "core.modulemanager"
 require "core.usermanager"
 require "core.sessionmanager"
 require "core.stanza_router"
-require "util.stanza"
-require "util.jid"
- 
--- Locals for faster access --
-local t_insert = table.insert;
-local t_concat = table.concat;
-local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
-local m_random = math.random;
-local format = string.format;
-local st = stanza;
-local init_xmlhandlers = xmlhandlers.init_xmlhandlers;
-------------------------------
 
+pcall(require, "remdebug.engine");
+if remdebug then remdebug.engine.start() end
 
+local start = require "net.connlisteners".start;
+require "util.stanza"
+require "util.jid"
 
-local hosts, users = hosts, users;
-
-function connect_host(host)
-       hosts[host] = { type = "remote", sendbuffer = {} };
-end
-
-function handler(conn, data, err)
-       local session = sessions[conn];
-
-       if not session then
-               sessions[conn] = sessionmanager.new_session(conn);
-               session = sessions[conn];
-
-               -- Logging functions --
-
-               local mainlog, log = log;
-               do
-                       local conn_name = tostring(conn):match("%w+$");
-                       log = function (type, area, message) mainlog(type, conn_name, message); end
-                       --log = function () end
-               end
-               local print = function (...) log("info", "core", t_concatall({...}, "\t")); end
-               session.log = log;
+------------------------------------------------------------------------
 
-               print("Client connected");
-               
-               session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
-               session.xml_handlers = init_xmlhandlers(session);
-               session.parser = lxp.new(session.xml_handlers, ":");
-                       
-               function session.disconnect(err)
-                       if session.last_presence and session.last_presence.attr.type ~= "unavailable" then
-                               local pres = st.presence{ type = "unavailable" };
-                               if err == "closed" then err = "connection closed"; end
-                               pres:tag("status"):text("Disconnected: "..err);
-                               session.stanza_dispatch(pres);
-                       end
-                       if session.username then
-                               hosts[session.host].sessions[session.username] = nil;
-                       end
-                       session = nil;
-                       print("Disconnected: "..err);
-                       collectgarbage("collect");
-               end
-       end
-       if data then
-               session.parser:parse(data);
+-- Initialise modules
+if config.modules and #config.modules > 0 then
+       for _, module in pairs(config.modules) do
+               modulemanager.load(module);
        end
-       
-       --log("info", "core", "Client disconnected, connection closed");
-end
-
-function disconnect(conn, err)
-       sessions[conn].disconnect(err);
-       sessions[conn] = nil;
-end
-
-modulemanager.loadall();
+else error("No modules enabled in the configuration file"); end
 
+-- setup error handling
 setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][];
 
-
 local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end;
 local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end;
 
-server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, nil ) -- server.add will send a status message
-server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5223, "*", 1, ssl_ctx ) -- server.add will send a status message
+-- start listening on sockets
+start("xmppclient", { ssl = config.ssl_ctx })
+start("xmppserver", { ssl = config.ssl_ctx })
 
 server.loop();