From a52c531dc50e00640070d61cf016b9ff031bed5d Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 28 Mar 2022 11:41:32 +0100 Subject: configmanager: Add method to report loaded config files (part of #1729 fix) --- core/configmanager.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/configmanager.lua b/core/configmanager.lua index a379ecea..4cd7c9d6 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -31,6 +31,7 @@ local parser = nil; 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 @@ function _M.load(filename, config_format) end end +function _M.files() + return files; +end + -- Built-in Lua parser do local pcall = _G.pcall; @@ -253,6 +258,8 @@ do return nil, err; end + t_insert(files, config_file); + return true, warnings; end -- cgit v1.2.3 From fdd5f22b8ac4960bed70380c018ed08f6702a71e Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 28 Mar 2022 11:41:57 +0100 Subject: prosodyctl: check config: Report paths of loaded configuration files (fixed #1729) --- util/prosodyctl/check.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua index e6b815f2..4b09ad8d 100644 --- a/util/prosodyctl/check.lua +++ b/util/prosodyctl/check.lua @@ -332,6 +332,13 @@ local function check(arg) 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", -- cgit v1.2.3