Remove redis hash access for user scripts disabled check

This commit is contained in:
emanuele-f 2019-10-23 14:40:43 +02:00
parent 60e657c0d2
commit 6fbc01b28e
2 changed files with 14 additions and 8 deletions

View file

@ -81,24 +81,24 @@ end
-- ##############################################
local function getCheckModuleConfHash(ifid, subdir, module_key)
return string.format("ntopng.prefs.user_scripts.conf.%s.ifid_%d.%s", subdir, ifid, module_key)
local function getUserScriptDisabledKey(ifid, subdir, module_key)
return string.format("ntopng.prefs.user_scripts.conf.%s.ifid_%d.%s.disabled", subdir, ifid, module_key)
end
-- ##############################################
-- @brief Enables a user script
function user_scripts.enableModule(ifid, subdir, module_key)
local hkey = getCheckModuleConfHash(ifid, subdir, module_key)
ntop.delHashCache(hkey, "disabled")
local key = getUserScriptDisabledKey(ifid, subdir, module_key)
ntop.delCache(key)
end
-- ##############################################
-- @brief Disables a user script
function user_scripts.disableModule(ifid, subdir, module_key)
local hkey = getCheckModuleConfHash(ifid, subdir, module_key)
ntop.setHashCache(hkey, "disabled", "1")
local key = getUserScriptDisabledKey(ifid, subdir, module_key)
ntop.setPref(key, "1")
end
-- ##############################################
@ -107,8 +107,8 @@ end
-- @return true if disabled, false otherwise
-- @notes Modules are neabled by default. The user can manually turn them off.
function user_scripts.isEnabled(ifid, subdir, module_key)
local hkey = getCheckModuleConfHash(ifid, subdir, module_key)
return(ntop.getHashCache(hkey, "disabled") ~= "1")
local key = getUserScriptDisabledKey(ifid, subdir, module_key)
return(ntop.getPref(key) ~= "1")
end
-- ##############################################