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

broker/Manager: Use serializer helper to extract metadata

Browse source
This commit is contained in:
Arne Welzel 2025-04-07 14:18:58 +02:00
parent f56e9082f1
commit d7599c897c
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/broker/Manager.cc
View file

@ -1572,15 +1572,11 @@ void Manager::ProcessMessage(std::string_view topic, broker::zeek::Event& ev) {
auto&& name = ev.name(); auto&& name = ev.name();
auto&& args = ev.args(); auto&& args = ev.args();
double ts;
if ( auto ev_ts = ev.ts() ) MetadataVectorPtr mdv = cluster::detail::metadata_vector_from_broker_event(ev);
broker::convert(*ev_ts, ts);
else
// Default to current network time, if the received event did not contain a timestamp.
ts = run_state::network_time;
DBG_LOG(DBG_BROKER, "Process event: %s (%.6f) %s", std::string{name}.c_str(), ts, RenderMessage(args).c_str()); DBG_LOG(DBG_BROKER, "Process event: %s (with %zu metadata entries) %s", std::string{name}.c_str(),
mdv ? mdv->size() : 0, RenderMessage(args).c_str());
num_events_incoming_metric->Inc(); num_events_incoming_metric->Inc();
auto handler = event_registry->Lookup(name); auto handler = event_registry->Lookup(name);
@ -1657,7 +1653,7 @@ void Manager::ProcessMessage(std::string_view topic, broker::zeek::Event& ev) {
} }
if ( vl.size() == args.size() ) if ( vl.size() == args.size() )
event_mgr.Enqueue(handler, std::move(vl), util::detail::SOURCE_BROKER, 0, nullptr, ts); event_mgr.Enqueue(WithMeta{}, handler, std::move(vl), util::detail::SOURCE_BROKER, 0, nullptr, std::move(mdv));
} }
bool Manager::ProcessMessage(std::string_view, broker::zeek::LogCreate& lc) { bool Manager::ProcessMessage(std::string_view, broker::zeek::LogCreate& lc) {