Add check to avoid "list x has 0 rules" on interrupted shutdowns

Fixes #3468
ntop · Mar 27, 2020 · e1f2824 · e1f2824
1 parent 9e07efe
commit e1f2824
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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();