vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Massive cleanup of flow user scripts into callback_definitions

Browse source
This commit is contained in:
Simone Mainardi 2021-04-30 15:33:41 +02:00
parent a37a74865f
commit bb26afe902
83 changed files with 346 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -347,7 +347,8 @@ function user_scripts.getSubdirectoryPath(script_type, subdir)
local prefix = plugins_utils.getRuntimePath() .. "/callbacks"
local path
if subdir == "host" then
if subdir == "host" or subdir == "flow" then
-- host and flow have their callbacks defined under modules/ and implemented in C++
path = string.format("%s/scripts/lua/modules/callback_definitions/%s", dirs.installdir, subdir)
elseif not isEmptyString(subdir) and subdir ~= "." then
path = string.format("%s/%s/%s", prefix, script_type.parent_dir, subdir)
@ -782,7 +783,7 @@ function user_scripts.load(ifid, script_type, subdir, options)
local full_path = os_utils.fixPath(checks_dir .. "/" .. fname)
local plugin = plugins_utils.getUserScriptPlugin(full_path)
if(plugin == nil) and subdir ~= "host" --[[ TODO: remove check when migration done --]] then
if(plugin == nil) and subdir ~= "host" and subdir ~= "flow" --[[ host and flow don't have plugins, they are implemented in C++ --]] then
traceError(TRACE_WARNING, TRACE_CONSOLE, string.format("Skipping unknown user script '%s'", mod_fname))
goto next_module
end