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

core.configmanager: Pass name and line number in context

Browse source 
Delays the string interpolation until the warning is logged, which may
slightly lower memory usage.

Allows retrieving the filename and line number easily.
This commit is contained in:
Kim Alvefur 2025-02-22 00:04:51 +01:00
parent 5e41daac79
commit 6b1e056142
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/configmanager.lua
View file

@ -48,7 +48,7 @@ end
function _M.get(host, key) function _M.get(host, key)
local v = config[host][key]; local v = config[host][key];
if v and errors.is_error(v) then if v and errors.is_error(v) then
log("warn", "%s", v.text); log("warn", "%s:%d: %s", v.context.filename, v.context.fileline, v.text);
return nil; return nil;
end end
return v; return v;
@ -376,10 +376,9 @@ do
else else
env.Credential = function() env.Credential = function()
return errors.new({ return errors.new({
type = "continue", type = "continue";
text = ("%s:%d: Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set") text = "Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set";
:format(config_file, get_line_number(config_file)); }, { filename = config_file; fileline = get_line_number(config_file) });
});
end end
end end