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

Integrate review feedback

Browse source
This commit is contained in:
Dominik Charousset 2025-02-15 16:37:24 +01:00
parent 30615f425e
commit 20b3eca257
3 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/base/frameworks/broker/log.zeek
View file

@ -95,3 +95,28 @@ event Broker::error(code: ErrorCode, msg: string)
Reporter::error(fmt("Broker error (%s): %s", code, msg)); Reporter::error(fmt("Broker error (%s): %s", code, msg));
} }
event Broker::internal_log_event(lvl: LogSeverityLevel, id: string, description: string)
{
local severity = Broker::CRITICAL_EVENT;
switch lvl {
case Broker::LOG_ERROR:
severity = Broker::ERROR;
break;
case Broker::LOG_WARNING:
severity = Broker::WARNING_EVENT;
break;
case Broker::LOG_INFO:
severity = Broker::INFO_EVENT;
break;
case Broker::LOG_VERBOSE:
severity = Broker::VERBOSE_EVENT;
break;
case Broker::LOG_DEBUG:
severity = Broker::DEBUG_EVENT;
break;
}
Log::write(Broker::LOG, [$ts = network_time(),
$ty = severity,
$ev = id,
$message = description]);
}

28
src/broker/Manager.cc
View file

@ -1135,14 +1135,12 @@ EnumValPtr lookup_enum_val(const char* module_name, const char* name) {
} // namespace } // namespace
void Manager::ProcessLogEvents() { void Manager::ProcessLogEvents() {
static auto plval = lookup_enum_val("Broker", "LOG"); static auto ev_critical = lookup_enum_val("Broker", "LOG_CRITICAL");
static auto lpli = id::find_type<RecordType>("Broker::Info"); static auto ev_error = lookup_enum_val("Broker", "LOG_ERROR");
static auto ev_critical = lookup_enum_val("Broker", "CRITICAL_EVENT"); static auto ev_warning = lookup_enum_val("Broker", "LOG_WARNING");
static auto ev_error = lookup_enum_val("Broker", "ERROR_EVENT"); static auto ev_info = lookup_enum_val("Broker", "LOG_INFO");
static auto ev_warning = lookup_enum_val("Broker", "WARNING_EVENT"); static auto ev_verbose = lookup_enum_val("Broker", "LOG_VERBOSE");
static auto ev_info = lookup_enum_val("Broker", "INFO_EVENT"); static auto ev_debug = lookup_enum_val("Broker", "LOG_DEBUG");
static auto ev_verbose = lookup_enum_val("Broker", "VERBOSE_EVENT");
static auto ev_debug = lookup_enum_val("Broker", "DEBUG_EVENT");
auto evType = [](BrokerSeverityLevel lvl) { auto evType = [](BrokerSeverityLevel lvl) {
switch ( lvl ) { switch ( lvl ) {
@ -1161,14 +1159,12 @@ void Manager::ProcessLogEvents() {
for ( auto& event : events ) { for ( auto& event : events ) {
auto severity = event->severity; auto severity = event->severity;
if ( bstate->logSeverity >= severity ) { if ( bstate->logSeverity >= severity ) {
auto record = make_intrusive<RecordVal>(lpli); auto args = Args{};
record->AssignTime(0, run_state::network_time); args.reserve(3);
record->Assign(1, evType(event->severity)); args.emplace_back(evType(severity));
auto ev = make_intrusive<StringVal>(event->identifier); args.emplace_back(make_intrusive<StringVal>(event->identifier));
record->Assign(2, ev); args.emplace_back(make_intrusive<StringVal>(event->description));
auto msg = make_intrusive<StringVal>(event->description); event_mgr.Enqueue(::Broker::internal_log_event, std::move(args));
record->Assign(4, msg);
log_mgr->Write(plval.get(), record.get());
} }
if ( bstate->stderrSeverity >= severity ) { if ( bstate->stderrSeverity >= severity ) {
fprintf(stderr, "[BROKER/%s] %s\n", severity_names_tbl[static_cast<int>(severity)], fprintf(stderr, "[BROKER/%s] %s\n", severity_names_tbl[static_cast<int>(severity)],

9
src/broker/comm.bif
View file

@ -7,6 +7,15 @@
module Broker; module Broker;
## Generated when Broker emits an internal logging event.
##
## lvl: the severity of the event as reported by Broker.
##
## id: an identifier for the event type.
##
## description: a message providing additional context.
event Broker::internal_log_event%(lvl: LogSeverityLevel, id: string, description: string%);
## Generated when a new peering has been established. Both sides of the peering ## Generated when a new peering has been established. Both sides of the peering
## receive this event, created independently in each endpoint. For the endpoint ## receive this event, created independently in each endpoint. For the endpoint
## establishing the peering, the added endpoint's network information will match ## establishing the peering, the added endpoint's network information will match