Merge branch 'topic/robin/exit-after-terminate'

* topic/robin/exit-after-terminate:
  Updating submodule(s).
  Fixing exit-after-terminate when used with bare mode.
  New option exit_only_after_terminate to prevent Bro from exiting.
This commit is contained in:
Robin Sommer 2013-02-04 09:44:33 -08:00
commit 52f52f60a5
4 changed files with 17 additions and 4 deletions

View file

@ -1055,7 +1055,9 @@ int main(int argc, char** argv)
io_sources.Register(thread_mgr, true);
if ( io_sources.Size() > 0 || have_pending_timers )
if ( io_sources.Size() > 0 ||
have_pending_timers ||
BifConst::exit_only_after_terminate )
{
if ( profiling_logger )
profiling_logger->Log();