Software / code / prosody
Changeset
11569:08dab7df152b
tools/cfgdump: Iterate in sort order to give stable output
Should allow using this tool for comparing configs without hash table
order messing things up.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 17 May 2021 16:33:44 +0200 |
| parents | 11568:d5360307a99d |
| children | 11570:c3896c714a83 |
| files | tools/cfgdump.lua |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/cfgdump.lua Mon May 17 14:14:25 2021 +0200 +++ b/tools/cfgdump.lua Mon May 17 16:33:44 2021 +0200 @@ -4,6 +4,7 @@ local s_format, print = string.format, print; local printf = function(fmt, ...) return print(s_format(fmt, ...)); end +local it = require "util.iterators"; local serialization = require"util.serialization"; local serialize = serialization.new and serialization.new({ unquoted = true }) or serialization.serialize; local configmanager = require"core.configmanager"; @@ -37,9 +38,9 @@ local config = configmanager.getconfig(); -for host, hostcfg in pairs(config) do +for host, hostcfg in it.sorted_pairs(config) do local fixed = {}; - for option, value in pairs(hostcfg) do + for option, value in it.sorted_pairs(hostcfg) do fixed[option] = value; if option:match("ports?$") or option:match("interfaces?$") then if option:match("s$") then @@ -61,7 +62,7 @@ local function printsection(section) local out, n = {}, 1; - for k,v in pairs(section) do + for k,v in it.sorted_pairs(section) do out[n], n = s_format("%s = %s", k, serialize(v)), n + 1; end table.sort(out); @@ -79,7 +80,7 @@ print("------------------------ Virtual hosts -------------------------"); -for host, hostcfg in pairs(config) do +for host, hostcfg in it.sorted_pairs(config) do setmetatable(hostcfg, nil); hostcfg.defined = nil; @@ -97,7 +98,7 @@ if has_components then print("------------------------- Components ---------------------------"); - for host, hostcfg in pairs(config) do + for host, hostcfg in it.sorted_pairs(config) do local component_module = hostcfg.component_module; hostcfg.component_module = nil;
