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

Move logging code to zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-01 10:48:05 -07:00
parent 9a800265ff
commit 45b5c6e619
25 changed files with 135 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/zeek-setup.cc
View file

@ -102,7 +102,8 @@ zeek::detail::DNS_Mgr*& dns_mgr = zeek::detail::dns_mgr;
zeek::detail::TimerMgr* zeek::detail::timer_mgr = nullptr;
zeek::detail::TimerMgr*& timer_mgr = zeek::detail::timer_mgr;
logging::Manager* log_mgr = nullptr;
zeek::logging::Manager* zeek::log_mgr = nullptr;
zeek::logging::Manager*& log_mgr = zeek::log_mgr;
threading::Manager* thread_mgr = nullptr;
zeek::input::Manager* zeek::input_mgr = nullptr;
zeek::input::Manager*& input_mgr = zeek::input_mgr;
@ -305,7 +306,7 @@ void terminate_bro()
zeek::event_mgr.Drain();
notifier::registry.Terminate();
log_mgr->Terminate();
zeek::log_mgr->Terminate();
zeek::input_mgr->Terminate();
thread_mgr->Terminate();
broker_mgr->Terminate();
@ -321,7 +322,7 @@ void terminate_bro()
// broker_mgr, timer_mgr, and supervisor are deleted via iosource_mgr
delete iosource_mgr;
delete zeek::event_registry;
delete log_mgr;
delete zeek::log_mgr;
delete zeek::reporter;
delete zeek::plugin_mgr;
delete zeek::val_mgr;
@ -581,7 +582,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
iosource_mgr = new iosource::Manager();
event_registry = new EventRegistry();
zeek::analyzer_mgr = new analyzer::Manager();
log_mgr = new logging::Manager();
zeek::log_mgr = new logging::Manager();
zeek::input_mgr = new input::Manager();
zeek::file_mgr = new file_analysis::Manager();
auto broker_real_time = ! options.pcap_file && ! options.deterministic_mode;
@ -659,7 +660,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
exit(1);
iosource_mgr->InitPostScript();
log_mgr->InitPostScript();
zeek::log_mgr->InitPostScript();
zeek::plugin_mgr->InitPostScript();
zeekygen_mgr->InitPostScript();
broker_mgr->InitPostScript();