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 branch 'origin/topic/robin/logging-internals'

Browse source 
Includes some additional cleanup.
This commit is contained in:
Robin Sommer 2011-04-20 20:27:00 -07:00
commit 13a492091f
119 changed files with 5266 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.cc
View file

@ -30,6 +30,7 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
#include "Event.h"
#include "File.h"
#include "Logger.h"
#include "LogMgr.h"
#include "Net.h"
#include "NetVar.h"
#include "Var.h"
@ -71,6 +72,7 @@ name_list prefixes;
DNS_Mgr* dns_mgr;
TimerMgr* timer_mgr;
Logger* bro_logger;
LogMgr* log_mgr;
Func* alarm_hook = 0;
Stmt* stmts;
EventHandlerPtr bro_signal = 0;
@ -288,6 +290,7 @@ void terminate_bro()
delete conn_compressor;
delete remote_serializer;
delete dpm;
delete log_mgr;
}
void termination_signal()
@ -702,7 +705,8 @@ int main(int argc, char** argv)
persistence_serializer = new PersistenceSerializer();
remote_serializer = new RemoteSerializer();
event_registry = new EventRegistry;
event_registry = new EventRegistry();
log_mgr = new LogMgr();
if ( events_file )
event_player = new EventPlayer(events_file);