Software / code / prosody
Changeset
9874:c9f5ccdcdf80
configmanager: Add support for returning warnings
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 20 Mar 2019 12:19:43 +0000 |
| parents | 9873:dfaeea570f7e |
| children | 9875:99291e124449 |
| files | core/configmanager.lua |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/configmanager.lua Wed Mar 20 12:18:34 2019 +0000 +++ b/core/configmanager.lua Wed Mar 20 12:19:43 2019 +0000 @@ -9,7 +9,7 @@ local _G = _G; local setmetatable, rawget, rawset, io, os, error, dofile, type, pairs = setmetatable, rawget, rawset, io, os, error, dofile, type, pairs; -local format, math_max = string.format, math.max; +local format, math_max, t_insert = string.format, math.max, table.insert; local envload = require"util.envload".envload; local deps = require"util.dependencies"; @@ -102,6 +102,7 @@ local pcall = _G.pcall; parser = {}; function parser.load(data, config_file, config_table) + local warnings = {}; local env; -- The ' = true' are needed so as not to set off __newindex when we assign the functions below env = setmetatable({ @@ -217,7 +218,7 @@ return nil, err; end - return true; + return true, warnings; end end
