From 35c6c21a151452b478ad58204086512a8151831a Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Fri, 27 Mar 2020 15:32:39 +0100 Subject: [PATCH] Add check to avoid "list x has 0 rules" on interrupted shutdowns Fixes #3468 --- scripts/lua/modules/lists_utils.lua | 2 +- src/Ntop.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lua/modules/lists_utils.lua b/scripts/lua/modules/lists_utils.lua index 954fa2471c36..90fd989ee3e0 100644 --- a/scripts/lua/modules/lists_utils.lua +++ b/scripts/lua/modules/lists_utils.lua @@ -580,7 +580,7 @@ local function loadFromListFile(list_name, list, user_custom_categories, stats) traceError(trace_level, TRACE_CONSOLE, string.format("\tRead '%d' rules", num_rules)) - if((num_rules == 0) and (not limit_exceeded)) then + if((num_rules == 0) and (not limit_exceeded) and (not ntop.isShutdown())) then traceError(TRACE_WARNING, TRACE_CONSOLE, string.format("List '%s' has 0 rules. Please report this to https://github.com/ntop/ntopng", list_name)) end diff --git a/src/Ntop.cpp b/src/Ntop.cpp index 0914ba98e950..8cb4ed5e0b19 100644 --- a/src/Ntop.cpp +++ b/src/Ntop.cpp @@ -512,6 +512,9 @@ void Ntop::start() { * After this call, startup.lua has completed. */ pa->startPeriodicActivitiesLoop(); + if(globals->isShutdownRequested()) + return; + if(get_HTTPserver()) get_HTTPserver()->start_accepting_requests();