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

Merge remote-tracking branch 'origin/master' into topic/johanna/243

Browse source
This commit is contained in:
Johanna Amann 2019-05-20 10:14:11 -07:00
commit 824ccde6fc
1222 changed files with 2435 additions and 2096 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h"
#include "zeek-config.h"
#include <stdio.h>
#include <stdlib.h>
@ -1067,6 +1067,7 @@ int main(int argc, char** argv)
reporter->FatalError("errors occurred while initializing");
broker_mgr->ZeekInitDone();
reporter->ZeekInitDone();
analyzer_mgr->DumpDebug();
have_pending_timers = ! reading_traces && timer_mgr->Size() > 0;