vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-28 23:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added check when a category list file is missing from filesystem

Browse source
This commit is contained in:
Luca Deri 2024-01-13 11:35:30 +01:00
parent e81058a7ba
commit bb7e60920b
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/lua/modules/lists_utils.lua
View file

@ -259,7 +259,6 @@ end
-- ##############################################
local function getListCacheFile(list_name, downloading)
local f = string.format("%s/category_lists/%s.txt", dirs.workingdir, list_name)
@ -310,7 +309,15 @@ function shouldUpdate(list_name, list, now)
return(false)
end
traceError(trace_level, TRACE_CONSOLE, string.format("Checking if list '%s' will be updated... ", list_name))
list_file = getListCacheFile(list_name, false)
if(not(ntop.exists(list_file))) then
-- The file does not exist: it needs to be downladed for sure
return true
end
next_update = getNextListUpdate(list, now)
if next_update == -1 then
@ -355,6 +362,8 @@ local function checkListsUpdate(timeout)
initListCacheDir()
traceError(trace_level, TRACE_INFO, "checkListsUpdate()")
for list_name, list in pairsByKeys(lists) do
local list_file = getListCacheFile(list_name, false)
@ -660,8 +669,9 @@ local function loadFromListFile(list_name, list, user_custom_categories, stats)
end
for line in f:lines() do
num_line = num_line + 1
if ntop.isShuttingDown() then
num_line = num_line + 1
if ntop.isShuttingDown() then
break
end
local trimmed = line:match("^%s*(.-)%s*$")
@ -752,10 +762,10 @@ local function reloadListsNow()
return(false)
end
traceError(trace_level, TRACE_CONSOLE, string.format("loading ndpi exceptions"))
traceError(trace_level, TRACE_CONSOLE, string.format("Loading nDPI Exceptions"))
loadnDPIExceptions()
traceError(trace_level, TRACE_CONSOLE, string.format("custom categories: reloading now"))
traceError(trace_level, TRACE_CONSOLE, string.format("Custom categories: reloading now"))
-- Load hosts from cached URL lists
for list_name, list in pairsByKeys(lists) do
@ -834,6 +844,8 @@ end
-- This is run in housekeeping.lua
function lists_utils.checkReloadLists()
traceError(trace_level, TRACE_CONSOLE, "Checking list reload")
if ntop.isOffline() then
return
end
@ -852,10 +864,8 @@ function lists_utils.checkReloadLists()
reload_now = forced_reload
end
-- print("[DEBUG] Checking reload [") if(reload_now) then print("reload now") else print("don't reload") end print("] !!!!\n")
if reload_now then
-- print("[DEBUG] **** Reloading ****\n")
traceError(trace_level, TRACE_INFO, "[DEBUG] Reloading lists")
if reloadListsNow() then
-- print("[DEBUG] Success !!!!\n")