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

Rename the Broker manager's LoggerAdapter

Browse source 
This is about to do more than just log handling, so this renames it simply to
Observer, reflecting the fact that it implements broker::event_observer.
This commit is contained in:
Christian Kreibich 2025-04-23 22:46:02 -07:00
parent 89780514fa
commit 23554280e0
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/broker/Manager.cc
View file

@ -128,19 +128,21 @@ using LoggerQueuePtr = std::shared_ptr<LoggerQueue>;
using BrokerSeverityLevel = broker::event::severity_level; using BrokerSeverityLevel = broker::event::severity_level;
class LoggerAdapter : public broker::event_observer { class Observer : public broker::event_observer {
public: public:
using SeverityLevel = broker::event::severity_level; using LogSeverityLevel = broker::event::severity_level;
explicit LoggerAdapter(SeverityLevel severity, LoggerQueuePtr queue) explicit Observer(LogSeverityLevel severity, LoggerQueuePtr queue)
: severity_(severity), queue_(std::move(queue)) {} : severity_(severity), queue_(std::move(queue)) {}
void observe(broker::event_ptr what) override { queue_->Push(std::move(what)); } void observe(broker::event_ptr what) override { queue_->Push(std::move(what)); }
bool accepts(SeverityLevel severity, broker::event::component_type) const override { return severity <= severity_; } bool accepts(LogSeverityLevel severity, broker::event::component_type) const override {
return severity <= severity_;
}
private: private:
SeverityLevel severity_; LogSeverityLevel severity_;
LoggerQueuePtr queue_; LoggerQueuePtr queue_;
}; };
@ -220,7 +222,7 @@ struct opt_mapping {
class BrokerState { class BrokerState {
public: public:
using SeverityLevel = LoggerAdapter::SeverityLevel; using LogSeverityLevel = Observer::LogSeverityLevel;
BrokerState(broker::configuration config, size_t congestion_queue_size, LoggerQueuePtr queue) BrokerState(broker::configuration config, size_t congestion_queue_size, LoggerQueuePtr queue)
: endpoint(std::move(config), telemetry_mgr->GetRegistry()), : endpoint(std::move(config), telemetry_mgr->GetRegistry()),
@ -231,8 +233,8 @@ public:
broker::endpoint endpoint; broker::endpoint endpoint;
broker::subscriber subscriber; broker::subscriber subscriber;
LoggerQueuePtr loggerQueue; LoggerQueuePtr loggerQueue;
SeverityLevel logSeverity = SeverityLevel::critical; LogSeverityLevel logSeverity = LogSeverityLevel::critical;
SeverityLevel stderrSeverity = SeverityLevel::critical; LogSeverityLevel stderrSeverity = LogSeverityLevel::critical;
std::unordered_set<broker::network_info> outbound_peerings; std::unordered_set<broker::network_info> outbound_peerings;
}; };
@ -402,8 +404,8 @@ void Manager::DoInitPostScript() {
checkLogSeverity(stderrSeverityVal); checkLogSeverity(stderrSeverityVal);
auto adapterVerbosity = static_cast<BrokerSeverityLevel>(std::max(logSeverityVal, stderrSeverityVal)); auto adapterVerbosity = static_cast<BrokerSeverityLevel>(std::max(logSeverityVal, stderrSeverityVal));
auto queue = std::make_shared<LoggerQueue>(); auto queue = std::make_shared<LoggerQueue>();
auto adapter = std::make_shared<LoggerAdapter>(adapterVerbosity, queue); auto observer = std::make_shared<Observer>(adapterVerbosity, queue);
broker::logger(adapter); // *must* be called before creating the BrokerState broker::logger(observer); // *must* be called before creating the BrokerState
auto cqs = get_option("Broker::congestion_queue_size")->AsCount(); auto cqs = get_option("Broker::congestion_queue_size")->AsCount();
bstate = std::make_shared<BrokerState>(std::move(config), cqs, queue); bstate = std::make_shared<BrokerState>(std::move(config), cqs, queue);