diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-09-04 17:22:04 +0300 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-12-06 15:57:24 +0200 |
commit | f5a07231b5dd97bdf23ab5a3bcfedd4c2aad1bee (patch) | |
tree | 5532feee1659a9a6f3ebd197618088ea20d0e01c | |
parent | f8874412c4315109202fbcf5632bec45525b2f4e (diff) | |
download | awall-f5a07231b5dd97bdf23ab5a3bcfedd4c2aad1bee.tar.bz2 awall-f5a07231b5dd97bdf23ab5a3bcfedd4c2aad1bee.tar.xz |
Log: deterministic option ordering
-rw-r--r-- | awall/modules/log.lua | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/awall/modules/log.lua b/awall/modules/log.lua index 876e7c7..a1fcb8c 100644 --- a/awall/modules/log.lua +++ b/awall/modules/log.lua @@ -54,29 +54,31 @@ function Log:optfrags() local targets = {} if mode then - local optmap = { - log={level='level', prefix='prefix'}, - nflog={ - group='group', - prefix='prefix', - range='size', - threshold='threshold' - }, - ulog={ - group='nlgroup', - prefix='prefix', - range='cprange', - threshold='qthreshold' + local optmap = ( + { + log={level='level', prefix='prefix'}, + nflog={ + group='group', + prefix='prefix', + range='size', + threshold='threshold' + }, + ulog={ + group='nlgroup', + prefix='prefix', + range='cprange', + threshold='qthreshold' + } } - } - if not optmap[mode] then self:error('Invalid logging mode: '..mode) end + )[mode] + if not optmap then self:error('Invalid logging mode: '..mode) end local target = mode:upper() - for s, t in pairs(optmap[mode]) do + for _, s in util.sortedkeys(optmap) do local value = self[s] if value then if s == 'prefix' then value = util.quote(value) end - target = target..' --'..mode..'-'..t..' '..value + target = target..' --'..mode..'-'..optmap[s]..' '..value end end |