mirror of
https://github.com/zeek/zeek.git
synced 2025-10-09 01:58:20 +00:00
Merge remote-tracking branch 'origin/topic/neverlord/hide-caf'
* origin/topic/neverlord/hide-caf: Fix GCC builds and string output for Broker errors Update to latest Broker without public CAF dep
This commit is contained in:
commit
5f1f005142
34 changed files with 393 additions and 1066 deletions
|
@ -581,7 +581,7 @@ SetupResult setup(int argc, char** argv, Options* zopts)
|
|||
file_mgr = new file_analysis::Manager();
|
||||
auto broker_real_time = ! options.pcap_file && ! options.deterministic_mode;
|
||||
broker_mgr = new Broker::Manager(broker_real_time);
|
||||
telemetry_mgr = broker_mgr->NewTelemetryManager().release();
|
||||
telemetry_mgr = new telemetry::Manager;
|
||||
trigger_mgr = new trigger::Manager();
|
||||
|
||||
plugin_mgr->InitPreScript();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue