vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-28 23:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix for #1972

Browse source
This commit is contained in:
Luca Deri 2018-09-04 12:38:42 +02:00
parent 08b8be0357
commit 87f8bece22
4 changed files with 137 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,8 @@ local prefs_dump_utils = {}
-- ###########################################
local debug = false
function prefs_dump_utils.savePrefsToDisk()
local dirs = ntop.getDirs()
local where = os_utils.fixPath(dirs.workingdir.."/runtimeprefs.json")
@ -23,7 +25,21 @@ function prefs_dump_utils.savePrefsToDisk()
local keys = ntop.getKeysCache(pattern)
for k in pairs(keys or {}) do
out[k] = ntop.dumpCache(k)
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)
end
end
end
@ -53,7 +69,15 @@ function prefs_dump_utils.readPrefsFromDisk()
for k,v in pairs(restore or {}) do
--print(k.." = " .. v .. "\n")
ntop.restoreCache(k,v)
if(v == "00000600CB7634C0FA2A9E49") then
-- 00000600CB7634C0FA2A9E49 is the dump for ""
ntop.delCache(k)
if(debug) then io.write("[RESTORE] Deleting empty value for "..k.."\n") end
else
if(debug) then io.write("[RESTORE] "..k.."="..v.."\n") end
ntop.restoreCache(k,v)
end
end
end
end