mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

modulemanager, moduleapi: Switch to new pluginloader interface

Browse source
This commit is contained in:
Matthew Wild 2022-02-04 14:11:46 +00:00
parent fdfaff07e0
commit 4bdff5a452
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/moduleapi.lua
View file

@ -10,7 +10,6 @@ local array = require "util.array";
local set = require "util.set";
local it = require "util.iterators";
local logger = require "util.logger";
local pluginloader = require "util.pluginloader";
local timer = require "util.timer";
local resolve_relative_path = require"util.paths".resolve_relative_path;
local st = require "util.stanza";
@ -129,7 +128,8 @@ function api:wrap_global(event, handler)
end
function api:require(lib)
local f, n = pluginloader.load_code_ext(self.name, lib, "lib.lua", self.environment);
local modulemanager = require"core.modulemanager";
local f, n = modulemanager.loader:load_code_ext(self.name, lib, "lib.lua", self.environment);
if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message
return f();
end

9
core/modulemanager.lua
View file

@ -52,6 +52,9 @@ local _G = _G;
local _ENV = nil;
-- luacheck: std none
local loader = pluginloader.init({
});
local load_modules_for_host, load, unload, reload, get_module, get_items;
local get_modules, is_loaded, module_has_method, call_module_method;
@ -184,7 +187,7 @@ local function do_load_module(host, module_name, state)
local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
api_instance.environment = pluginenv;
local mod, err = pluginloader.load_code(module_name, nil, pluginenv);
local mod, err = loader:load_code(module_name, nil, pluginenv);
if not mod then
log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
api_instance:set_status("error", "Failed to load (see log)");
@ -271,7 +274,7 @@ local function do_reload_module(host, name)
local mod = get_module(host, name);
if not mod then return nil, "module-not-loaded"; end
local _mod, err = pluginloader.load_code(name); -- checking for syntax errors
local _mod, err = loader:load_code(name); -- checking for syntax errors
if not _mod then
log("error", "Unable to load module '%s': %s", name or "nil", err or "nil");
return nil, err;
@ -395,4 +398,6 @@ return {
is_loaded = is_loaded;
module_has_method = module_has_method;
call_module_method = call_module_method;
loader = loader;
};