From cb243e2d2858ee8f5ee4122e6332e13a4c14a6ea Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 17 Apr 2025 10:16:14 +0200 Subject: [PATCH] broker: Deprecate NodeID(), use SetNodeId() --- src/broker/Manager.cc | 2 ++ src/broker/Manager.h | 2 +- src/broker/comm.bif | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 69d543ad79..88e6413ffd 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -418,6 +418,8 @@ void Manager::DoInitPostScript() { bstate->subscriber.add_topic(broker::topic::store_events(), true); + SetNodeId(broker::to_string(bstate->endpoint.node_id())); + InitializeBrokerStoreForwarding(); num_peers_metric = diff --git a/src/broker/Manager.h b/src/broker/Manager.h index b1fdc8105c..1673818349 100644 --- a/src/broker/Manager.h +++ b/src/broker/Manager.h @@ -178,7 +178,7 @@ public: /** * @return a unique identifier for this broker endpoint. */ - std::string NodeID() const; + [[deprecated("Remove in v8.1: Use Backend::NodeId() instead.")]] std::string NodeID() const; /** * Send an identifier's value to interested peers. diff --git a/src/broker/comm.bif b/src/broker/comm.bif index 0fefce871d..d348b5ebff 100644 --- a/src/broker/comm.bif +++ b/src/broker/comm.bif @@ -262,5 +262,5 @@ function Broker::__peers%(%): PeerInfos function Broker::__node_id%(%): string %{ zeek::Broker::Manager::ScriptScopeGuard ssg; - return zeek::make_intrusive(broker_mgr->NodeID()); + return zeek::make_intrusive(broker_mgr->NodeId()); %}