Software / code / prosody
Changeset
12442:1c322c277923
Merge 0.12->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 28 Mar 2022 11:42:16 +0100 |
| parents | 12439:f0064191f885 (current diff) 12441:dc6263625069 (diff) |
| children | 12445:8d5fa022721c |
| files | |
| diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/core/configmanager.lua Mon Mar 28 11:08:53 2022 +0100 +++ b/core/configmanager.lua Mon Mar 28 11:42:16 2022 +0100 @@ -31,6 +31,7 @@ local config_mt = { __index = function (t, _) return rawget(t, "*"); end}; local config = setmetatable({ ["*"] = { } }, config_mt); +local files = {}; -- When host not found, use global local host_mt = { __index = function(_, k) return config["*"][k] end } @@ -98,6 +99,10 @@ end end +function _M.files() + return files; +end + -- Built-in Lua parser do local pcall = _G.pcall; @@ -253,6 +258,8 @@ return nil, err; end + t_insert(files, config_file); + return true, warnings; end
--- a/util/prosodyctl/check.lua Mon Mar 28 11:08:53 2022 +0100 +++ b/util/prosodyctl/check.lua Mon Mar 28 11:42:16 2022 +0100 @@ -332,6 +332,13 @@ end if not what or what == "config" then print("Checking config..."); + + if what == "config" then + local files = configmanager.files(); + print(" The following configuration files have been loaded:"); + print(" - "..table.concat(files, "\n - ")); + end + local obsolete = set.new({ --> remove "archive_cleanup_interval", "cross_domain_bosh",
