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

Fixed exclusion list not updated

Browse source
This commit is contained in:
Matteo Biscosi 2021-02-11 17:41:46 +01:00
parent c82e007653
commit 138f712591
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1116,7 +1116,26 @@ function user_scripts.updateScriptConfig(confid, script_key, subdir, new_config,
if script then
local prev_config = config[subdir][script_key]
-- Perform hook callbacks for config changes, or enable/disable
for hook, hook_config in pairs(prev_config) do
applied_config[hook] = hook_config
local hook_applied_config = applied_config[hook]
if hook_applied_config then
if script.onDisable and hook_config.enabled and not hook_applied_config.enabled then
-- Hook previously disabled has been enabled
script.onDisable(hook, hook_applied_config)
elseif script.onEnable and not hook_config.enabled and hook_applied_config.enabled then
-- Hook previously enabled has now been disabled
script.onEnable(hook, hook_applied_config)
elseif script.onUpdateConfig and not table.compare(hook_config, applied_config[hook]) then
-- Configuration for the hook has changed
script.onUpdateConfig(hook, hook_applied_config)
end
end
end
-- Updating the filters
if additional_filters then
applied_config["filter"] = prev_config["filter"]
@ -1139,7 +1158,7 @@ function user_scripts.updateScriptConfig(confid, script_key, subdir, new_config,
-- There can be multiple filters, so cycle through them
for _, new_filter in pairs(additional_filters["new_filters"]) do
local add_params = filterIsEqual(applied_config["filter"]["current_filters"], new_filter)
if add_params > 0 then
applied_config["filter"]["current_filters"][add_params] = new_filter
else
@ -1148,25 +1167,6 @@ function user_scripts.updateScriptConfig(confid, script_key, subdir, new_config,
end
end
end
-- Perform hook callbacks for config changes, or enable/disable
for hook, hook_config in pairs(prev_config) do
applied_config[hook] = hook_config
local hook_applied_config = applied_config[hook]
if hook_applied_config then
if script.onDisable and hook_config.enabled and not hook_applied_config.enabled then
-- Hook previously disabled has been enabled
script.onDisable(hook, hook_applied_config)
elseif script.onEnable and not hook_config.enabled and hook_applied_config.enabled then
-- Hook previously enabled has now been disabled
script.onEnable(hook, hook_applied_config)
elseif script.onUpdateConfig and not table.compare(hook_config, applied_config[hook]) then
-- Configuration for the hook has changed
script.onUpdateConfig(hook, hook_applied_config)
end
end
end
end
-- Set the new configuration