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

Avoids accessing empty configurations (new user scripts)

Browse source
This commit is contained in:
Simone Mainardi 2020-10-30 08:52:40 +01:00
parent 0369ac5e72
commit c947265462
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -772,8 +772,6 @@ function user_scripts.loadUnloadUserScripts(is_load)
for confid, config in pairs(configsets) do
-- Call user script callbacks for
-- each available configuration existing for the user script
local s = config.config[subdir.id][script.key]
if not config.config then
traceError(TRACE_ERROR,TRACE_CONSOLE, string.format("Configuration is missing"))
return
@ -785,24 +783,26 @@ function user_scripts.loadUnloadUserScripts(is_load)
end
if not config.config[subdir.id][script.key] then
traceError(TRACE_ERROR,TRACE_CONSOLE,
string.format("Script '%s' configuration is missing from subdir '%s'", script.key, subdir.id))
return
end
-- Configuration can be empty (for example the first time a user script is added)
traceError(TRACE_NORMAL,TRACE_CONSOLE,
string.format("Script '%s' configuration is missing from subdir '%s'. New user script?", script.key, subdir.id))
else
local s = config.config[subdir.id][script.key]
if(s ~= nil) then
for hook, hook_config in pairs(s) do
-- For each configuration there are multiple hooks.
-- Some hooks can be enabled, whereas some other hooks can be disabled:
-- methods onLoad/onUnload are only called for hooks that are enabled.
if script and hook_config.enabled then
-- onLoad/onUnload methods are ONLY called for user scripts that are enabled
if is_load and script.onLoad then
-- This is a load operation
script.onLoad(hook, hook_config)
elseif not is_load and script.onUnload then
-- This is an unload operation
script.onUnload(hook, hook_config)
if(s ~= nil) then
for hook, hook_config in pairs(s) do
-- For each configuration there are multiple hooks.
-- Some hooks can be enabled, whereas some other hooks can be disabled:
-- methods onLoad/onUnload are only called for hooks that are enabled.
if script and hook_config.enabled then
-- onLoad/onUnload methods are ONLY called for user scripts that are enabled
if is_load and script.onLoad then
-- This is a load operation
script.onLoad(hook, hook_config)
elseif not is_load and script.onUnload then
-- This is an unload operation
script.onUnload(hook, hook_config)
end
end
end
end