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

moduleapi: Log error message when ambiguous period spec is found in config

Browse source
This commit is contained in:
Matthew Wild 2023-11-30 13:43:23 +00:00
parent a669ffb5a2
commit 2132eca2e0
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/moduleapi.lua
View file

@ -281,7 +281,15 @@ function api:get_option_period(name, default_value, min, max)
elseif type(value) == "string" then elseif type(value) == "string" then
ret = human_io.parse_duration(value); ret = human_io.parse_duration(value);
if value ~= nil and ret == nil then if value ~= nil and ret == nil then
self:log("error", "Config option '%s' not understood, expecting a period (e.g. \"2 days\")", name); ret = human_io.parse_duration_lax(value);
if ret then
local num = value:match("%d+");
self:log("error", "Config option '%s' is set to ambiguous period '%s' - use full syntax e.g. '%s months' or '%s minutes'", name, value, num, num);
-- COMPAT: w/more relaxed behaviour in post-0.12 trunk. Return nil for this case too, eventually.
else
self:log("error", "Config option '%s' not understood, expecting a period (e.g. \"2 days\")", name);
return nil;
end
end end
elseif value ~= nil then elseif value ~= nil then
self:log("error", "Config option '%s' expects a number or a period description string (e.g. \"3 hours\"), not %s", name, type(value)); self:log("error", "Config option '%s' expects a number or a period description string (e.g. \"3 hours\"), not %s", name, type(value));