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

Fixes license changes and removes duplicated logic

Browse source 
Addresses #5965
This commit is contained in:
Simone Mainardi 2021-10-11 16:03:51 +02:00
parent 5502f3fc2e
commit b1499dc6db
3 changed files with 22 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,18 +94,30 @@ end
-- ###########################################
function scripts_triggers.checkReloadPlugins(when)
local demo_ends_at = ntop.getInfo()["pro.demo_ends_at"]
local time_delta = demo_ends_at - when
local plugins_reloaded = false
-- tprint({time_delta = time_delta, demo_ends_at = demo_ends_at, when = when, is_pro = ntop.isPro()})
if ntop.getCache('ntopng.cache.force_reload_plugins') == '1' then
return(true)
else
local demo_ends_at = ntop.getInfo()["pro.demo_ends_at"]
local time_delta = demo_ends_at - when
if demo_ends_at and demo_ends_at > 0 and time_delta <= 10 and ntop.isPro() and not ntop.hasPluginsReloaded() then
return(true)
end
-- Check and possibly reload plugins after a user has changed (e.g., applied or removed) a license
-- from the web user interface (page about.lua)
local plugins_utils = require "plugins_utils"
ntop.delCache('ntopng.cache.force_reload_plugins')
plugins_utils.loadPlugins(not ntop.isPro() --[[ reload only community if license is not pro --]])
plugins_reloaded = true
elseif demo_ends_at and demo_ends_at > 0 and time_delta <= 10 and ntop.isPro() and not ntop.hasPluginsReloaded() then
-- Checks and possibly reload plugins for demo licenses. In case of demo licenses,
-- if within 10 seconds from the license expirations, a plugin reload is executed only for the community plugins
local plugins_utils = require "plugins_utils"
plugins_utils.loadPlugins(true --[[ reload only community plugins --]])
plugins_reloaded = true
end
return(false)
if plugins_reloaded then
ntop.reloadPlugins()
end
end
-- ###########################################