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 remote-tracking branch 'origin/master' into topic/bernhard/sqlite

Browse source 
Conflicts:
	src/threading/AsciiFormatter.cc
This commit is contained in:
Bernhard Amann 2013-03-11 11:47:10 -07:00
commit 8cb91de93a
203 changed files with 3278 additions and 1284 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.cc
View file

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