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

Separate old benchmark from user scripts

Browse source
This commit is contained in:
emanuele-f 2019-11-14 19:16:49 +01:00
parent 214103689c
commit bea63668b8
3 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -326,6 +326,20 @@ end
-- ##############################################
function user_scripts.getLastBenchmark(ifid, subdir)
local scripts_benchmarks = ntop.getCache(user_scripts_benchmarks_key(ifid, subdir))
if(not isEmptyString(scripts_benchmarks)) then
scripts_benchmarks = json.decode(scripts_benchmarks)
else
scripts_benchmarks = nil
end
return(scripts_benchmarks)
end
-- ##############################################
-- @brief Load the user scripts.
-- @params script_type one of user_scripts.script_types
-- @params ifid the interface ID
@ -350,12 +364,6 @@ function user_scripts.load(script_type, ifid, subdir, hook_filter, ignore_disabl
end
local check_dirs = getScriptsDirectories(script_type, subdir)
local scripts_benchmarks = ntop.getCache(user_scripts_benchmarks_key(ifid, subdir))
if(not isEmptyString(scripts_benchmarks)) then
scripts_benchmarks = json.decode(scripts_benchmarks)
end
scripts_benchmarks = scripts_benchmarks or {}
for _, checks_dir in pairs(check_dirs) do
package.path = checks_dir .. "/?.lua;" .. package.path
@ -430,8 +438,6 @@ function user_scripts.load(script_type, ifid, subdir, hook_filter, ignore_disabl
goto next_module
end
user_script["benchmark"] = scripts_benchmarks[mod_fname]
-- Populate hooks fast lookup table
for hook, hook_fn in pairs(user_script.hooks) do
-- load previously computed benchmarks (if any)