projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e40db1b)
Backed out BOSH use of util.async (changeset f0687c313cf1)
authorKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 11:46:52 +0000 (12:46 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 11:46:52 +0000 (12:46 +0100)
plugins/mod_bosh.lua patch | blob | history

diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index fd33226cccede8ea51786249791281b21af912d3..840de72525209d74f5f4a7ad5c71d1fd3e625c33 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -22,7 +22,6 @@ local initialize_filters = require "util.filters".initialize;
 local math_min = math.min;
 local xpcall, tostring, type = xpcall, tostring, type;
 local traceback = debug.traceback;
-local runner = require"util.async".runner;
 
 local xmlns_streams = "http://etherx.jabber.org/streams";
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@ -229,8 +228,6 @@ local function bosh_close_stream(session, reason)
        sm_destroy_session(session);
 end
 
-local runner_callbacks = { };
-
 -- Handle the <body> tag in the request payload.
 function stream_callbacks.streamopened(context, attr)
        local request, response = context.request, context.response;
@@ -263,10 +260,6 @@ function stream_callbacks.streamopened(context, attr)
                };
                sessions[sid] = session;
 
-               session.thread = runner(function (stanza)
-                       session:dispatch_stanza(stanza);
-               end, runner_callbacks, session);
-
                local filter = initialize_filters(session);
 
                session.log("debug", "BOSH session created for request from %s", session.ip);
@@ -364,11 +357,6 @@ function stream_callbacks.streamopened(context, attr)
 end
 
 local function handleerr(err) log("error", "Traceback[bosh]: %s", traceback(tostring(err), 2)); end
-
-function runner_callbacks:error(err)
-       return handleerr(err);
-end
-
 function stream_callbacks.handlestanza(context, stanza)
        if context.ignore then return; end
        log("debug", "BOSH stanza received: %s\n", stanza:top_tag());
@@ -378,7 +366,9 @@ function stream_callbacks.handlestanza(context, stanza)
                        stanza.attr.xmlns = nil;
                end
                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
 end