aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-10-26 19:32:00 +0100
committerMatthew Wild <mwild1@gmail.com>2018-10-26 19:32:00 +0100
commit9b5c6c4d9de2d32a3a0391e6d06a178f21dbb807 (patch)
tree0eff02506e6364d1dcb5c71b2edaacd6662ffe20 /plugins
parent3bc2c02797799a0e71c4a04dc810d2d683271c42 (diff)
downloadprosody-9b5c6c4d9de2d32a3a0391e6d06a178f21dbb807.tar.gz
prosody-9b5c6c4d9de2d32a3a0391e6d06a178f21dbb807.zip
Many things: switch from hacky multi-arg xpcall implementations to a standard util.xpcall
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_component.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 743a16a3..b41204a2 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -9,7 +9,8 @@
module:set_global();
local t_concat = table.concat;
-local xpcall, tostring, type = xpcall, tostring, type;
+local tostring, type = tostring, type;
+local xpcall = require "util.xpcall".xpcall;
local traceback = debug.traceback;
local logger = require "util.logger";
@@ -238,7 +239,7 @@ function stream_callbacks.handlestanza(session, stanza)
end
if stanza then
- return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
+ return xpcall(core_process_stanza, handleerr, session, stanza);
end
end