From 0575d4baaae6e13c9a6f614ca5da6f6192db167b Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 26 Oct 2018 19:53:02 +0100
Subject: modulemanager: Fix issues introduced in previous commit acf74ad0b795
[thanks luacheck, scansion]
---
core/modulemanager.lua | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 63b5e177..17602459 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -19,12 +19,9 @@ local prosody = prosody;
local hosts = prosody.hosts;
local xpcall = require "util.xpcall".xpcall;
-local setmetatable, rawget = setmetatable, rawget;
-local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert;
-
local debug_traceback = debug.traceback;
-local select = select;
-local unpack = table.unpack or unpack; --luacheck: ignore 113
+local setmetatable, rawget = setmetatable, rawget;
+local ipairs, pairs, type, t_insert = ipairs, pairs, type, table.insert;
local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s", "s2s_auth_certs"};
local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"};
@@ -178,7 +175,7 @@ local function do_load_module(host, module_name, state)
api_instance.path = err;
modulemap[host][module_name] = pluginenv;
- local ok, err = xpcall(mod, debug.traceback);
+ local ok, err = xpcall(mod, debug_traceback);
if ok then
-- Call module's "load"
if module_has_method(pluginenv, "load") then
@@ -320,7 +317,7 @@ end
function call_module_method(module, method, ...)
local f = rawget(module.module, method);
if type(f) == "function" then
- return pcall(f, ...);
+ return xpcall(f, debug_traceback, ...);
else
return false, "no-such-method";
end
--
cgit v1.2.3