Fix file analysis events from coming after bro_done().

BIT-1256 #close
This commit is contained in:
Jon Siwek 2014-09-18 14:29:46 -05:00
parent e5bd113286
commit 17d60ea8ac
3 changed files with 10 additions and 2 deletions

View file

@ -1,4 +1,9 @@
2.3-178 | 2014-09-18 14:29:46 -0500
* BIT-1256: Fix file analysis events from coming after bro_done().
(Jon Siwek)
2.3-177 | 2014-09-17 09:41:27 -0500 2.3-177 | 2014-09-17 09:41:27 -0500
* Documentation fixes. (Chris Mavrakis) * Documentation fixes. (Chris Mavrakis)

View file

@ -1 +1 @@
2.3-177 2.3-178

View file

@ -341,6 +341,10 @@ void terminate_bro()
terminating = true; terminating = true;
// File analysis termination may produce events, so do it early on in
// the termination process.
file_mgr->Terminate();
brofiler.WriteStats(); brofiler.WriteStats();
EventHandlerPtr bro_done = internal_handler("bro_done"); EventHandlerPtr bro_done = internal_handler("bro_done");
@ -365,7 +369,6 @@ void terminate_bro()
mgr.Drain(); mgr.Drain();
file_mgr->Terminate();
log_mgr->Terminate(); log_mgr->Terminate();
input_mgr->Terminate(); input_mgr->Terminate();
thread_mgr->Terminate(); thread_mgr->Terminate();