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

Merge branch 'topic/timw/switch-broker-error-to-error'

Browse source 
* topic/timw/switch-broker-error-to-error:
  Downgrade broker clone FatalError to an Error

(cherry picked from commit 2c17c85f55)
This commit is contained in:
Tim Wojtulewicz 2025-05-08 13:46:54 -07:00
parent 1807710a8c
commit 9369a6e3dd
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
7.2.0-rc1.16 | 2025-05-08 13:47:36 -0700
* Downgrade broker clone FatalError to an Error (Tim Wojtulewicz, Corelight)
(cherry picked from commit 2c17c85f557245b6163ced014fc1d8089e1fcdf2)
7.2.0-rc1.14 | 2025-05-07 14:11:04 -0700 7.2.0-rc1.14 | 2025-05-07 14:11:04 -0700
* Fix Broker metrics naming bugs that snuck in w/ last-minute renaming [skip ci] (Christian Kreibich, Corelight) * Fix Broker metrics naming bugs that snuck in w/ last-minute renaming [skip ci] (Christian Kreibich, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.2.0-rc1.14 7.2.0-rc1.16

6
src/broker/Manager.cc
View file

@ -2086,8 +2086,10 @@ detail::StoreHandleVal* Manager::MakeClone(const string& name, double resync_int
auto handle = new detail::StoreHandleVal{*result}; auto handle = new detail::StoreHandleVal{*result};
Ref(handle); Ref(handle);
if ( ! handle->proxy.valid() ) if ( ! handle->proxy.valid() ) {
reporter->FatalError("Failed to create clone for data store %s", name.c_str()); reporter->Error("Failed to create clone for data store %s", name.c_str());
return nullptr;
}
data_stores.emplace(name, handle); data_stores.emplace(name, handle);
if ( ! iosource_mgr->RegisterFd(handle->proxy.mailbox().descriptor(), this) ) if ( ! iosource_mgr->RegisterFd(handle->proxy.mailbox().descriptor(), this) )