mirror of
https://github.com/bjc/prosody.git
synced 2025-04-01 20:27:39 +03:00
core.configmanager: Pass name and line number in context
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:
parent
5e41daac79
commit
6b1e056142
1 changed files with 4 additions and 5 deletions
|
@ -48,7 +48,7 @@ end
|
|||
function _M.get(host, key)
|
||||
local v = config[host][key];
|
||||
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;
|
||||
end
|
||||
return v;
|
||||
|
@ -376,10 +376,9 @@ do
|
|||
else
|
||||
env.Credential = function()
|
||||
return errors.new({
|
||||
type = "continue",
|
||||
text = ("%s:%d: Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set")
|
||||
:format(config_file, get_line_number(config_file));
|
||||
});
|
||||
type = "continue";
|
||||
text = "Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set";
|
||||
}, { filename = config_file; fileline = get_line_number(config_file) });
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue