Software / code / prosody
Changeset
5727:372ecf3630cf
mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other listeners. This ensures that stanzas following a traceback-causing stanza in a request will still be processed (as would happen on normal c2s).
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 08 Jul 2013 23:59:27 +0100 |
| parents | 5726:3bccc68a38e3 |
| children | 5728:2ecf400b194a |
| files | plugins/mod_bosh.lua |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_bosh.lua Mon Jul 08 23:42:54 2013 +0100 +++ b/plugins/mod_bosh.lua Mon Jul 08 23:59:27 2013 +0100 @@ -20,6 +20,8 @@ local log = logger.init("mod_bosh"); local initialize_filters = require "util.filters".initialize; local math_min = math.min; +local xpcall, tostring, type = xpcall, tostring, type; +local traceback = debug.traceback; local xmlns_streams = "http://etherx.jabber.org/streams"; local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams"; @@ -352,6 +354,7 @@ end end +local function handleerr(err) log("error", "Traceback[bosh]: %s", traceback(tostring(err), 2)); end function stream_callbacks.handlestanza(context, stanza) if context.ignore then return; end log("debug", "BOSH stanza received: %s\n", stanza:top_tag()); @@ -362,7 +365,7 @@ end stanza = session.filter("stanzas/in", stanza); if stanza then - core_process_stanza(session, stanza); + return xpcall(function () return core_process_stanza(session, stanza) end, handleerr); end end end
