vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Prevents empty keys from being dumped/restored

Browse source
This commit is contained in:
Simone Mainardi 2018-09-04 14:57:11 +02:00
parent cfc345709d
commit d10a88d739
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/lua/modules/prefs_dump_utils.lua
View file

@ -10,6 +10,9 @@ local os_utils = require "os_utils"
local prefs_dump_utils = {}
-- 00000600CB7634C0FA2A9E49 is the dump for ""
local empty_string_dump = "00000600CB7634C0FA2A9E49"
-- ###########################################
local debug = false
@ -25,20 +28,9 @@ function prefs_dump_utils.savePrefsToDisk()
local keys = ntop.getKeysCache(pattern)
for k in pairs(keys or {}) do
local do_dump = true
if(pattern == "ntopng.prefs.*") then
local ret = ntop.getPrefs(k)
if(type(ret) == "string") then
if(ret == "") then
if(debug) then io.write("[SAVE] Discarding empty value for "..k.."\n") end
do_dump = false
end
end
end
if(do_dump) then
out[k] = ntop.dumpCache(k)
local dump = ntop.dumpCache(k)
if dump ~= empty_string_dump then
out[k] = dump
end
end
end
@ -70,8 +62,7 @@ function prefs_dump_utils.readPrefsFromDisk()
for k,v in pairs(restore or {}) do
--print(k.." = " .. v .. "\n")
if(v == "00000600CB7634C0FA2A9E49") then
-- 00000600CB7634C0FA2A9E49 is the dump for ""
if(v == empty_string_dump) then
ntop.delCache(k)
if(debug) then io.write("[RESTORE] Deleting empty value for "..k.."\n") end
else