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

Move configsets to redis hash

Browse source
This commit is contained in:
emanuele-f 2020-01-02 12:21:22 +01:00
parent 1b438d3619
commit 94e717d604
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/lua/modules/user_scripts.lua
View file

@ -30,7 +30,7 @@ user_scripts.field_units = {
local CALLBACKS_DIR = plugins_utils.PLUGINS_RUNTIME_PATH .. "/callbacks"
local NON_TRAFFIC_ELEMENT_CONF_KEY = "all"
local NON_TRAFFIC_ELEMENT_ENTITY = "no_entity"
local CONFIGSETS_KEY = "ntopng.prefs.user_scripts.configsets"
local CONFIGSETS_KEY = "ntopng.prefs.user_scripts.configsets_v1"
user_scripts.DEFAULT_CONFIGSET_ID = 0
-- NOTE: the subdir id must be unique
@ -1118,9 +1118,12 @@ local function saveConfigsets(configsets)
return rv, err
end
local confjson = json.encode(configsets)
for _, configset in pairs(configsets) do
local k = string.format("%d", configset.id)
local v = json.encode(configset)
ntop.setPref(CONFIGSETS_KEY, confjson)
ntop.setHashCache(CONFIGSETS_KEY, k, v)
end
-- Reload the periodic scripts as the configuration has changed
ntop.reloadPeriodicScripts()
@ -1131,14 +1134,15 @@ end
-- ##############################################
function user_scripts.getConfigsets()
local configsets = ntop.getPref(CONFIGSETS_KEY) or ""
local configsets = ntop.getHashAllCache(CONFIGSETS_KEY)
local rv = {}
configsets = json.decode(configsets) or {}
for _, confset_json in pairs(configsets) do
local confset = json.decode(confset_json)
-- Convert the ID keys to number
for _, confset in pairs(configsets) do
rv[confset.id] = confset
if confset then
rv[confset.id] = confset
end
end
return(rv)