From 17d60ea8ace4dcd94892fd8bcf0131c4e1a82a94 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@illinois.edu>
Date: Thu, 18 Sep 2014 14:29:46 -0500
Subject: [PATCH] Fix file analysis events from coming after bro_done().

BIT-1256 #close
---
 CHANGES     | 5 +++++
 VERSION     | 2 +-
 src/main.cc | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0d5a0c2cc8..2ee7a6870d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
 
   * Documentation fixes. (Chris Mavrakis)
diff --git a/VERSION b/VERSION
index 27e55a7cb7..b0b576f1ff 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-177
+2.3-178
diff --git a/src/main.cc b/src/main.cc
index ddd65fafd5..73f7119e7a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -341,6 +341,10 @@ void terminate_bro()
 
 	terminating = true;
 
+	// File analysis termination may produce events, so do it early on in
+	// the termination process.
+	file_mgr->Terminate();
+
 	brofiler.WriteStats();
 
 	EventHandlerPtr bro_done = internal_handler("bro_done");
@@ -365,7 +369,6 @@ void terminate_bro()
 
 	mgr.Drain();
 
-	file_mgr->Terminate();
 	log_mgr->Terminate();
 	input_mgr->Terminate();
 	thread_mgr->Terminate();