mod_c2s: Remove use of util.async

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 6aa0a4f0f17d147a0b6d2930436ec3b5508084c8..c8856634205ddcd108ba8af7e508489bd3b35b84 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -72,7 +72,6 @@ local function retire_session(session)
 
        function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); return false; end
        function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
-       session.thread = { run = function (_, data) return session.data(data) end };
        return setmetatable(session, resting_session);
 end
 

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 42c35689ca357f05b9ba8dac0470674885f95576..d950225deccae9b0336788a2e27a318b32900ff9 100644 (file)
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -15,10 +15,9 @@ local sessionmanager = require "core.sessionmanager";
 local st = require "util.stanza";
 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
 local uuid_generate = require "util.uuid".generate;
-local runner = require "util.async".runner;
 
 local xpcall, tostring, type = xpcall, tostring, type;
-local t_insert, t_remove = table.insert, table.remove;
+local traceback = debug.traceback;
 
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 
@@ -36,7 +35,6 @@ local hosts = prosody.hosts;
 
 local stream_callbacks = { default_ns = "jabber:client" };
 local listener = {};
-local runner_callbacks = {};
 
 --- Stream events handlers
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
@@ -123,9 +121,12 @@ function stream_callbacks.error(session, error, data)
        end
 end
 
+local function handleerr(err) log("error", "Traceback[c2s]: %s", traceback(tostring(err), 2)); end
 function stream_callbacks.handlestanza(session, stanza)
        stanza = session.filter("stanzas/in", stanza);
-       session.thread:run(stanza);
+       if stanza then
+               return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
+       end
 end
 
 --- Session methods
@@ -191,18 +192,6 @@ module:hook_global("user-deleted", function(event)
        end
 end, 200);
 
-function runner_callbacks:ready()
-       self.data.conn:resume();
-end
-
-function runner_callbacks:waiting()
-       self.data.conn:pause();
-end
-
-function runner_callbacks:error(err)
-       (self.data.log or log)("error", "Traceback[c2s]: %s", err);
-end
-
 --- Port listener
 function listener.onconnect(conn)
        measure_connections(1);
@@ -240,10 +229,6 @@ function listener.onconnect(conn)
                session.stream:reset();
        end
 
-       session.thread = runner(function (stanza)
-               core_process_stanza(session, stanza);
-       end, runner_callbacks, session);
-
        local filter = session.filter;
        function session.data(data)
                -- Parse the data, which will store stanzas in session.pending_stanzas