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

Merge remote-tracking branch 'origin/topic/robin/exit-after-terminate' into topic/bernhard/input-tests-exit-after-terminate

Browse source
This commit is contained in:
Bernhard Amann 2013-02-01 15:14:49 -08:00
commit d4289b3313
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aux/btest

@ -1 +1 @@
Subproject commit 6c0f099c52f9e7b5d6f3efafb63581a6cc0861a5 Subproject commit ba0700fe448895b654b90d50f389f6f1341234cb

2
src/main.cc
View file

@ -1055,7 +1055,7 @@ int main(int argc, char** argv)
io_sources.Register(thread_mgr, true); 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 ) if ( profiling_logger )
profiling_logger->Log(); profiling_logger->Log();