diff --git a/scripts/base/frameworks/broker/main.zeek b/scripts/base/frameworks/broker/main.zeek index 7402d39ecb..1dccd123bd 100644 --- a/scripts/base/frameworks/broker/main.zeek +++ b/scripts/base/frameworks/broker/main.zeek @@ -72,7 +72,7 @@ export { ## The number of buffered messages at the Broker/CAF layer after which ## a subscriber considers themselves congested (i.e. tune the congestion ## control mechanisms). - const congestion_queue_size = 200 &redef; + const congestion_queue_size = 200 &redef &deprecated="Remove in v8.1. Non-functional since v5.0"; ## The max number of log entries per log stream to batch together when ## sending log messages to a remote logger. diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 853255523b..9b89452674 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -404,11 +404,9 @@ class BrokerState { public: using LogSeverityLevel = Observer::LogSeverityLevel; - BrokerState(broker::configuration config, size_t congestion_queue_size, LoggerQueuePtr queue, - PeerBufferStatePtr pbstate) + BrokerState(broker::configuration config, LoggerQueuePtr queue, PeerBufferStatePtr pbstate) : endpoint(std::move(config), telemetry_mgr->GetRegistry()), - subscriber( - endpoint.make_subscriber({broker::topic::statuses(), broker::topic::errors()}, congestion_queue_size)), + subscriber(endpoint.make_subscriber({broker::topic::statuses(), broker::topic::errors()})), loggerQueue(std::move(queue)), peerBufferState(std::move(pbstate)) { peerBufferState->SetEndpoint(&endpoint); @@ -594,8 +592,7 @@ void Manager::DoInitPostScript() { auto observer = std::make_shared(adapterVerbosity, queue, pbstate); broker::logger(observer); // *must* be called before creating the BrokerState - auto cqs = get_option("Broker::congestion_queue_size")->AsCount(); - bstate = std::make_shared(std::move(config), cqs, queue, pbstate); + bstate = std::make_shared(std::move(config), queue, pbstate); bstate->logSeverity = static_cast(logSeverityVal); bstate->stderrSeverity = static_cast(stderrSeverityVal);