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 36ece23043fb34540a3ae870c7a80d10250346fd..5bfe48718ea76b8a3dc9e97965ecbcce49830c7b 100644 (file)
--- 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();