Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 08:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/telemetry-threading'

Browse source 
* origin/topic/timw/telemetry-threading:
  Process metric callbacks from the main-loop thread

(cherry picked from commit 3c3853dc7d)
This commit is contained in:
Tim Wojtulewicz 2024-08-02 15:49:40 -07:00
parent 056bbe04ea
commit dd4597865a
10 changed files with 130 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/zeek-setup.cc
View file

@ -376,6 +376,7 @@ static void terminate_zeek() {
input_mgr->Terminate();
thread_mgr->Terminate();
broker_mgr->Terminate();
telemetry_mgr->Terminate();
event_mgr.Drain();
@ -716,6 +717,7 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
// when that variable is defined.
auto early_shutdown = [] {
broker_mgr->Terminate();
telemetry_mgr->Terminate();
delete iosource_mgr;
delete telemetry_mgr;
};