Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into topic/jsiwek/file-analysis

Browse source
This commit is contained in:
Jon Siwek 2013-02-08 09:53:27 -06:00
commit b9d204005d
107 changed files with 1539 additions and 786 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.cc
View file

@ -830,6 +830,8 @@ int main(int argc, char** argv)
exit(1);
}
reporter->InitOptions();
init_general_global_var();
if ( user_pcap_filter )
@ -1059,7 +1061,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();