From: Steve Chew (stechew) <stechew@cisco.com>
Date: Fri, 4 Sep 2020 19:19:07 +0000 (+0000)
Subject: Merge pull request #2453 in SNORT/snort3 from ~STECHEW/snort3:move_term_signal to... 
X-Git-Tag: 3.0.2-6~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53dcf934320de9e2b6a2e091083b05e4977bd33d;p=thirdparty%2Fsnort3.git

Merge pull request #2453 in SNORT/snort3 from ~STECHEW/snort3:move_term_signal to master

Squashed commit of the following:

commit b3e7752fee4aa1b2d81af24ca37b39500f7f899f
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Sep 2 14:50:51 2020 -0400

    main: Turn off signal handlers later to catch more during snort shutdown.
---

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 432cbf5c5..4c41f4169 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -310,15 +310,14 @@ void Snort::term()
     static bool already_exiting = false;
     if ( already_exiting )
         return;
+    already_exiting = true;
 
     const SnortConfig* sc = SnortConfig::get_conf();
 
-    already_exiting = true;
     initializing = false;  // just in case we cut out early
 
     memory::MemoryCap::print();
 
-    term_signals();
     IpsManager::global_term(sc);
     HostAttributesManager::term();
 
@@ -365,6 +364,7 @@ void Snort::term()
     ModuleManager::term();
     PluginManager::release_plugins();
     ScriptManager::release_scripts();
+    term_signals();
 }
 
 void Snort::clean_exit(int)