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

Cleanup to remove flow_consts no longer needed

Browse source
This commit is contained in:
Simone Mainardi 2020-12-22 17:59:51 +01:00
parent 1d633cf23c
commit 16e2c9efe2
8 changed files with 39 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scripts/lua/modules/plugins_utils.lua
View file

@ -279,31 +279,6 @@ end
-- ##############################################
local function load_plugin_flow_status_definitions(plugin)
-- Reset all the possibly existing (and loaded) flow statuses.
-- This is necessary to forcefully re-execute `require`s during
-- the load of new flows statuses which is being performed
local flow_consts = require "flow_consts"
flow_consts.resetDefinitions()
-- Now that existing flow statuses have been cleaned, it is
-- safe to load new ones
local status_definitions
if(plugin.edition == "community") then
status_definitions = RUNTIME_PATHS.status_definitions
else
-- It's necessary to split pro plugins to avoid errors on demo mode end
-- while loading pro scripts
status_definitions = RUNTIME_PATHS.pro_status_definitions
end
return load_definitions(os_utils.fixPath(plugin.path .. "/status_definitions"), status_definitions)
end
-- ##############################################
local function load_plugin_ts_schemas(plugin)
local src_path = os_utils.fixPath(plugin.path .. "/ts_schemas")
local ts_path = os_utils.fixPath(RUNTIME_PATHS.ts_schemas .. "/" .. plugin.key)
@ -620,11 +595,6 @@ function plugins_utils.loadPlugins(community_plugins_only)
-- subsequent `require "alert_consts"`
package.loaded["alert_consts"] = nil
-- Load plugin flow status definitions, i.e., definitions found under <plugin_name>/status_definitions
for _, plugin in ipairs(plugins) do
load_plugin_flow_status_definitions(plugin)
end
-- Load the plugins following the dependecies order
for _, plugin in ipairs(plugins) do
if community_plugins_only and plugin.edition ~= "community" then