Merge branch 'topic/bernhard/log-threads' into topic/bernhard/input-threads

This commit is contained in:
Bernhard Amann 2012-02-13 02:37:02 -08:00
commit 4e868d282d
36 changed files with 414 additions and 304 deletions

View file

@ -293,6 +293,7 @@ void terminate_bro()
if ( remote_serializer )
remote_serializer->LogStats();
log_mgr->Terminate();
thread_mgr->Terminate();
delete timer_mgr;