From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 10 Jan 2019 16:53:20 +0000 (-0500)
Subject: Merge pull request #1482 in SNORT/snort3 from ~CWAXMAN/snort3:file_race to master
X-Git-Tag: 3.0.0-251~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974449fbe18fb79db70d0644b422feba19d5ee4f;p=thirdparty%2Fsnort3.git

Merge pull request #1482 in SNORT/snort3 from ~CWAXMAN/snort3:file_race to master

Squashed commit of the following:

commit d9fe7ab30e1daf7033821ff9993c1227bbe1fb9d
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Jan 8 16:35:07 2019 -0500

    file: fixed data race at shutdown
---

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 36ece2304..5bfe48718 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -456,8 +456,6 @@ void Snort::term()
 
     //MpseManager::print_search_engine_stats();
 
-    FileService::close();
-
     sfthreshold_free();  // FIXDAQ etc.
     RateFilter_Cleanup();
 
@@ -552,6 +550,7 @@ void Snort::cleanup()
     TimeStop();
 
     SFDAQ::term();
+    FileService::close();
 
     if ( !SnortConfig::test_mode() )  // FIXIT-M ideally the check is in one place
         PrintStatistics();