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

Rework alertEntity functions to avoid modules circular dependencies

Browse source 
Fixes #2975
This commit is contained in:
emanuele-f 2019-10-23 13:01:57 +02:00
parent 19f820f1bc
commit 10aa5542f8
30 changed files with 112 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/lua/modules/system_scripts_utils.lua
View file

@ -10,7 +10,6 @@ package.path = dirs.installdir .. "/scripts/lua/modules/timeseries/?.lua;" .. pa
local os_utils = require("os_utils")
local ts_utils = require("ts_utils_core")
require "alert_utils"
local system_scripts_dir = dirs.installdir .. "/scripts/callbacks/system"
local task_to_periodicity = {
@ -226,6 +225,9 @@ end
-- ##############################################
function system_scripts.hasAlerts(options)
-- Requring alert_utils here to optimize second.lua
require("alert_utils")
local opts = table.merge(options, {ifid = getSystemInterfaceId()})
local old_iface = iface
local rv