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

modulemanager, util.pluginloader: Move logic for locating some module libraries to pluginloader, to fix problems with non-filesystem errors being masked by the second load_code call

Browse source
This commit is contained in:
Matthew Wild 2016-02-01 21:26:15 +00:00
parent d920df1dfb
commit a1e077c5e7
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/moduleapi.lua
View file

@ -135,10 +135,7 @@ function api:wrap_global(event, handler)
end end
function api:require(lib) function api:require(lib)
local f, n = pluginloader.load_code(self.name, lib..".lib.lua", self.environment); local f, n = pluginloader.load_code_ext(self.name, lib, "lib.lua", self.environment);
if not f then
f, n = pluginloader.load_code(lib, lib..".lib.lua", self.environment);
end
if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message
return f(); return f();
end end

15
util/pluginloader.lua
View file

@ -55,8 +55,23 @@ local function load_code(plugin, resource, env)
return f, path; return f, path;
end end
local function load_code_ext(plugin, resource, extension, env)
local content, err = load_resource(plugin, resource.."."..extension);
if not content then
content, err = load_resource(resource, resource.."."..extension);
if not content then
return content, err;
end
end
local path = err;
local f, err = envload(content, "@"..path, env);
if not f then return f, err; end
return f, path;
end
return { return {
load_file = load_file; load_file = load_file;
load_resource = load_resource; load_resource = load_resource;
load_code = load_code; load_code = load_code;
load_code_ext = load_code_ext;
}; };