mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Move Reporter to zeek namespace
This commit is contained in:
Tim Wojtulewicz
parent
7cedd94ee7
commit
bfab224d7c
132 changed files with 1010 additions and 987 deletions
|
|
@ -33,7 +33,7 @@ static inline zeek::Val* get_option(const char* option)
|
|||
const auto& id = zeek::detail::global_scope()->Find(option);
|
||||
|
||||
if ( ! (id && id->GetVal()) )
|
||||
reporter->FatalError("Unknown Broker option %s", option);
|
||||
zeek::reporter->FatalError("Unknown Broker option %s", option);
|
||||
|
||||
return id->GetVal().get();
|
||||
}
|
||||
|
|
@ -72,12 +72,12 @@ int Manager::script_scope = 0;
|
|||
struct scoped_reporter_location {
|
||||
scoped_reporter_location(zeek::detail::Frame* frame)
|
||||
{
|
||||
reporter->PushLocation(frame->GetCall()->GetLocationInfo());
|
||||
zeek::reporter->PushLocation(frame->GetCall()->GetLocationInfo());
|
||||
}
|
||||
|
||||
~scoped_reporter_location()
|
||||
{
|
||||
reporter->PopLocation();
|
||||
zeek::reporter->PopLocation();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -179,7 +179,7 @@ void Manager::InitPostScript()
|
|||
else if ( streq(scheduler_policy, "stealing") )
|
||||
config.set("scheduler.policy", caf::atom("stealing"));
|
||||
else
|
||||
reporter->FatalError("Invalid Broker::scheduler_policy: %s", scheduler_policy);
|
||||
zeek::reporter->FatalError("Invalid Broker::scheduler_policy: %s", scheduler_policy);
|
||||
|
||||
auto max_threads_env = zeekenv("ZEEK_BROKER_MAX_THREADS");
|
||||
|
||||
|
|
@ -211,9 +211,9 @@ void Manager::InitPostScript()
|
|||
bstate = std::make_shared<BrokerState>(std::move(config), cqs);
|
||||
|
||||
if ( ! iosource_mgr->RegisterFd(bstate->subscriber.fd(), this) )
|
||||
reporter->FatalError("Failed to register broker subscriber with iosource_mgr");
|
||||
zeek::reporter->FatalError("Failed to register broker subscriber with iosource_mgr");
|
||||
if ( ! iosource_mgr->RegisterFd(bstate->status_subscriber.fd(), this) )
|
||||
reporter->FatalError("Failed to register broker status subscriber with iosource_mgr");
|
||||
zeek::reporter->FatalError("Failed to register broker status subscriber with iosource_mgr");
|
||||
|
||||
bstate->subscriber.add_topic(broker::topics::store_events, true);
|
||||
|
||||
|
|
@ -507,8 +507,8 @@ bool Manager::PublishLogCreate(zeek::EnumVal* stream, zeek::EnumVal* writer,
|
|||
|
||||
if ( ! stream_id )
|
||||
{
|
||||
reporter->Error("Failed to remotely log: stream %d doesn't have name",
|
||||
stream->AsEnum());
|
||||
zeek::reporter->Error("Failed to remotely log: stream %d doesn't have name",
|
||||
stream->AsEnum());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -516,8 +516,8 @@ bool Manager::PublishLogCreate(zeek::EnumVal* stream, zeek::EnumVal* writer,
|
|||
|
||||
if ( ! writer_id )
|
||||
{
|
||||
reporter->Error("Failed to remotely log: writer %d doesn't have name",
|
||||
writer->AsEnum());
|
||||
zeek::reporter->Error("Failed to remotely log: writer %d doesn't have name",
|
||||
writer->AsEnum());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -563,8 +563,8 @@ bool Manager::PublishLogWrite(zeek::EnumVal* stream, zeek::EnumVal* writer, stri
|
|||
|
||||
if ( ! stream_id )
|
||||
{
|
||||
reporter->Error("Failed to remotely log: stream %d doesn't have name",
|
||||
stream->AsEnum());
|
||||
zeek::reporter->Error("Failed to remotely log: stream %d doesn't have name",
|
||||
stream->AsEnum());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -572,8 +572,8 @@ bool Manager::PublishLogWrite(zeek::EnumVal* stream, zeek::EnumVal* writer, stri
|
|||
|
||||
if ( ! writer_id )
|
||||
{
|
||||
reporter->Error("Failed to remotely log: writer %d doesn't have name",
|
||||
writer->AsEnum());
|
||||
zeek::reporter->Error("Failed to remotely log: writer %d doesn't have name",
|
||||
writer->AsEnum());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -587,7 +587,7 @@ bool Manager::PublishLogWrite(zeek::EnumVal* stream, zeek::EnumVal* writer, stri
|
|||
|
||||
if ( ! success )
|
||||
{
|
||||
reporter->Error("Failed to remotely log stream %s: num_fields serialization failed", stream_id);
|
||||
zeek::reporter->Error("Failed to remotely log stream %s: num_fields serialization failed", stream_id);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -595,7 +595,7 @@ bool Manager::PublishLogWrite(zeek::EnumVal* stream, zeek::EnumVal* writer, stri
|
|||
{
|
||||
if ( ! vals[i]->Write(&fmt) )
|
||||
{
|
||||
reporter->Error("Failed to remotely log stream %s: field %d serialization failed", stream_id, i);
|
||||
zeek::reporter->Error("Failed to remotely log stream %s: field %d serialization failed", stream_id, i);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -609,9 +609,9 @@ bool Manager::PublishLogWrite(zeek::EnumVal* stream, zeek::EnumVal* writer, stri
|
|||
|
||||
if ( ! v )
|
||||
{
|
||||
reporter->Error("Failed to remotely log: log_topic func did not return"
|
||||
" a value for stream %s at path %s", stream_id,
|
||||
path.data());
|
||||
zeek::reporter->Error("Failed to remotely log: log_topic func did not return"
|
||||
" a value for stream %s at path %s", stream_id,
|
||||
path.data());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -685,7 +685,7 @@ void Manager::Error(const char* format, ...)
|
|||
if ( script_scope )
|
||||
zeek::emit_builtin_error(msg);
|
||||
else
|
||||
reporter->Error("%s", msg);
|
||||
zeek::reporter->Error("%s", msg);
|
||||
}
|
||||
|
||||
bool Manager::AutoPublishEvent(string topic, zeek::Val* event)
|
||||
|
|
@ -872,8 +872,8 @@ void Manager::DispatchMessage(const broker::topic& topic, broker::data msg)
|
|||
{
|
||||
switch ( broker::zeek::Message::type(msg) ) {
|
||||
case broker::zeek::Message::Type::Invalid:
|
||||
reporter->Warning("received invalid broker message: %s",
|
||||
broker::to_string(msg).data());
|
||||
zeek::reporter->Warning("received invalid broker message: %s",
|
||||
broker::to_string(msg).data());
|
||||
break;
|
||||
|
||||
case broker::zeek::Message::Type::Event:
|
||||
|
|
@ -898,8 +898,8 @@ void Manager::DispatchMessage(const broker::topic& topic, broker::data msg)
|
|||
|
||||
if ( ! batch.valid() )
|
||||
{
|
||||
reporter->Warning("received invalid broker Batch: %s",
|
||||
broker::to_string(batch).data());
|
||||
zeek::reporter->Warning("received invalid broker Batch: %s",
|
||||
broker::to_string(batch).data());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -912,8 +912,8 @@ void Manager::DispatchMessage(const broker::topic& topic, broker::data msg)
|
|||
default:
|
||||
// We ignore unknown types so that we could add more in the
|
||||
// future if we had too.
|
||||
reporter->Warning("received unknown broker message: %s",
|
||||
broker::to_string(msg).data());
|
||||
zeek::reporter->Warning("received unknown broker message: %s",
|
||||
broker::to_string(msg).data());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -945,7 +945,7 @@ void Manager::Process()
|
|||
continue;
|
||||
}
|
||||
|
||||
reporter->InternalWarning("ignoring status_subscriber message with unexpected type");
|
||||
zeek::reporter->InternalWarning("ignoring status_subscriber message with unexpected type");
|
||||
}
|
||||
|
||||
auto messages = bstate->subscriber.poll();
|
||||
|
|
@ -974,7 +974,7 @@ void Manager::Process()
|
|||
}
|
||||
catch ( std::runtime_error& e )
|
||||
{
|
||||
reporter->Warning("ignoring invalid Broker message: %s", + e.what());
|
||||
zeek::reporter->Warning("ignoring invalid Broker message: %s", + e.what());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
@ -1025,7 +1025,7 @@ void Manager::ProcessStoreEventInsertUpdate(const zeek::TableValPtr& table,
|
|||
|
||||
if ( table->GetType()->IsSet() && data.get_type() != broker::data::type::none )
|
||||
{
|
||||
reporter->Error("ProcessStoreEvent %s got %s when expecting set", type, data.get_type_name());
|
||||
zeek::reporter->Error("ProcessStoreEvent %s got %s when expecting set", type, data.get_type_name());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1034,7 +1034,7 @@ void Manager::ProcessStoreEventInsertUpdate(const zeek::TableValPtr& table,
|
|||
auto zeek_key = data_to_val(key, its[0].get());
|
||||
if ( ! zeek_key )
|
||||
{
|
||||
reporter->Error("ProcessStoreEvent %s: could not convert key \"%s\" for store \"%s\" while receiving remote data. This probably means the tables have different types on different nodes.", type, to_string(key).c_str(), store_id.c_str());
|
||||
zeek::reporter->Error("ProcessStoreEvent %s: could not convert key \"%s\" for store \"%s\" while receiving remote data. This probably means the tables have different types on different nodes.", type, to_string(key).c_str(), store_id.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1048,7 +1048,7 @@ void Manager::ProcessStoreEventInsertUpdate(const zeek::TableValPtr& table,
|
|||
auto zeek_value = data_to_val(data, table->GetType()->Yield().get());
|
||||
if ( ! zeek_value )
|
||||
{
|
||||
reporter->Error("ProcessStoreEvent %s: could not convert value \"%s\" for key \"%s\" in store \"%s\" while receiving remote data. This probably means the tables have different types on different nodes.", type, to_string(data).c_str(), to_string(key).c_str(), store_id.c_str());
|
||||
zeek::reporter->Error("ProcessStoreEvent %s: could not convert value \"%s\" for key \"%s\" in store \"%s\" while receiving remote data. This probably means the tables have different types on different nodes.", type, to_string(data).c_str(), to_string(key).c_str(), store_id.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1110,7 +1110,7 @@ void Manager::ProcessStoreEvent(broker::data msg)
|
|||
auto zeek_key = data_to_val(key, its[0].get());
|
||||
if ( ! zeek_key )
|
||||
{
|
||||
reporter->Error("ProcessStoreEvent: could not convert key \"%s\" for store \"%s\" while receiving remote erase. This probably means the tables have different types on different nodes.", to_string(key).c_str(), insert.store_id().c_str());
|
||||
zeek::reporter->Error("ProcessStoreEvent: could not convert key \"%s\" for store \"%s\" while receiving remote erase. This probably means the tables have different types on different nodes.", to_string(key).c_str(), insert.store_id().c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1134,7 +1134,7 @@ void Manager::ProcessStoreEvent(broker::data msg)
|
|||
}
|
||||
else
|
||||
{
|
||||
reporter->Error("ProcessStoreEvent: Unhandled event type");
|
||||
zeek::reporter->Error("ProcessStoreEvent: Unhandled event type");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1142,8 +1142,8 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
|
|||
{
|
||||
if ( ! ev.valid() )
|
||||
{
|
||||
reporter->Warning("received invalid broker Event: %s",
|
||||
broker::to_string(ev.as_data()).data());
|
||||
zeek::reporter->Warning("received invalid broker Event: %s",
|
||||
broker::to_string(ev.as_data()).data());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1177,9 +1177,9 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
|
|||
|
||||
if ( arg_types.size() != args.size() )
|
||||
{
|
||||
reporter->Warning("got event message '%s' with invalid # of args,"
|
||||
" got %zd, expected %zu", name.data(), args.size(),
|
||||
arg_types.size());
|
||||
zeek::reporter->Warning("got event message '%s' with invalid # of args,"
|
||||
" got %zd, expected %zu", name.data(), args.size(),
|
||||
arg_types.size());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1198,17 +1198,18 @@ void Manager::ProcessEvent(const broker::topic& topic, broker::zeek::Event ev)
|
|||
{
|
||||
auto expected_name = zeek::type_name(expected_type->Tag());
|
||||
|
||||
reporter->Warning("failed to convert remote event '%s' arg #%lu,"
|
||||
" got %s, expected %s",
|
||||
name.data(), i, got_type,
|
||||
expected_name);
|
||||
zeek::reporter->Warning("failed to convert remote event '%s' arg #%lu,"
|
||||
" got %s, expected %s",
|
||||
name.data(), i, got_type,
|
||||
expected_name);
|
||||
|
||||
// If we got a vector and expected a function this is
|
||||
// possibly because of a mismatch between
|
||||
// anonymous-function bodies.
|
||||
if ( strcmp(expected_name, "func") == 0 && strcmp("vector", got_type) == 0 )
|
||||
reporter->Warning("when sending functions the receiver must have access to a"
|
||||
" version of that function.\nFor anonymous functions, that function must have the same body.");
|
||||
zeek::reporter->Warning(
|
||||
"when sending functions the receiver must have access to a"
|
||||
" version of that function.\nFor anonymous functions, that function must have the same body.");
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -1223,29 +1224,29 @@ bool bro_broker::Manager::ProcessLogCreate(broker::zeek::LogCreate lc)
|
|||
DBG_LOG(DBG_BROKER, "Received log-create: %s", RenderMessage(lc.as_data()).c_str());
|
||||
if ( ! lc.valid() )
|
||||
{
|
||||
reporter->Warning("received invalid broker LogCreate: %s",
|
||||
broker::to_string(lc).data());
|
||||
zeek::reporter->Warning("received invalid broker LogCreate: %s",
|
||||
broker::to_string(lc).data());
|
||||
return false;
|
||||
}
|
||||
|
||||
auto stream_id = data_to_val(std::move(lc.stream_id()), log_id_type);
|
||||
if ( ! stream_id )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log stream id");
|
||||
zeek::reporter->Warning("failed to unpack remote log stream id");
|
||||
return false;
|
||||
}
|
||||
|
||||
auto writer_id = data_to_val(std::move(lc.writer_id()), writer_id_type);
|
||||
if ( ! writer_id )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log writer id");
|
||||
zeek::reporter->Warning("failed to unpack remote log writer id");
|
||||
return false;
|
||||
}
|
||||
|
||||
auto writer_info = std::unique_ptr<logging::WriterBackend::WriterInfo>(new logging::WriterBackend::WriterInfo);
|
||||
if ( ! writer_info->FromBroker(std::move(lc.writer_info())) )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log writer info");
|
||||
zeek::reporter->Warning("failed to unpack remote log writer info");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1254,7 +1255,7 @@ bool bro_broker::Manager::ProcessLogCreate(broker::zeek::LogCreate lc)
|
|||
|
||||
if ( ! fields_data )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log fields");
|
||||
zeek::reporter->Warning("failed to unpack remote log fields");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1267,7 +1268,7 @@ bool bro_broker::Manager::ProcessLogCreate(broker::zeek::LogCreate lc)
|
|||
fields[i] = field;
|
||||
else
|
||||
{
|
||||
reporter->Warning("failed to convert remote log field # %lu", i);
|
||||
zeek::reporter->Warning("failed to convert remote log field # %lu", i);
|
||||
delete [] fields;
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1277,7 +1278,7 @@ bool bro_broker::Manager::ProcessLogCreate(broker::zeek::LogCreate lc)
|
|||
{
|
||||
ODesc d;
|
||||
stream_id->Describe(&d);
|
||||
reporter->Warning("failed to create remote log stream for %s locally", d.Description());
|
||||
zeek::reporter->Warning("failed to create remote log stream for %s locally", d.Description());
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
@ -1289,7 +1290,7 @@ bool bro_broker::Manager::ProcessLogWrite(broker::zeek::LogWrite lw)
|
|||
|
||||
if ( ! lw.valid() )
|
||||
{
|
||||
reporter->Warning("received invalid broker LogWrite: %s",
|
||||
zeek::reporter->Warning("received invalid broker LogWrite: %s",
|
||||
broker::to_string(lw).data());
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1302,8 +1303,8 @@ bool bro_broker::Manager::ProcessLogWrite(broker::zeek::LogWrite lw)
|
|||
|
||||
if ( ! stream_id )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log stream id: %s",
|
||||
stream_id_name.data());
|
||||
zeek::reporter->Warning("failed to unpack remote log stream id: %s",
|
||||
stream_id_name.data());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1311,7 +1312,7 @@ bool bro_broker::Manager::ProcessLogWrite(broker::zeek::LogWrite lw)
|
|||
auto writer_id = data_to_val(std::move(lw.writer_id()), writer_id_type);
|
||||
if ( ! writer_id )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log writer id for stream: %s", stream_id_name.data());
|
||||
zeek::reporter->Warning("failed to unpack remote log writer id for stream: %s", stream_id_name.data());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1319,7 +1320,7 @@ bool bro_broker::Manager::ProcessLogWrite(broker::zeek::LogWrite lw)
|
|||
|
||||
if ( ! path )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log values (bad path variant) for stream: %s", stream_id_name.data());
|
||||
zeek::reporter->Warning("failed to unpack remote log values (bad path variant) for stream: %s", stream_id_name.data());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1327,7 +1328,7 @@ bool bro_broker::Manager::ProcessLogWrite(broker::zeek::LogWrite lw)
|
|||
|
||||
if ( ! serial_data )
|
||||
{
|
||||
reporter->Warning("failed to unpack remote log values (bad serial_data variant) for stream: %s", stream_id_name.data());
|
||||
zeek::reporter->Warning("failed to unpack remote log values (bad serial_data variant) for stream: %s", stream_id_name.data());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1339,7 +1340,7 @@ bool bro_broker::Manager::ProcessLogWrite(broker::zeek::LogWrite lw)
|
|||
|
||||
if ( ! success )
|
||||
{
|
||||
reporter->Warning("failed to unserialize remote log num fields for stream: %s", stream_id_name.data());
|
||||
zeek::reporter->Warning("failed to unserialize remote log num fields for stream: %s", stream_id_name.data());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1355,7 +1356,7 @@ bool bro_broker::Manager::ProcessLogWrite(broker::zeek::LogWrite lw)
|
|||
delete vals[j];
|
||||
|
||||
delete [] vals;
|
||||
reporter->Warning("failed to unserialize remote log field %d for stream: %s", i, stream_id_name.data());
|
||||
zeek::reporter->Warning("failed to unserialize remote log field %d for stream: %s", i, stream_id_name.data());
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1373,8 +1374,8 @@ bool Manager::ProcessIdentifierUpdate(broker::zeek::IdentifierUpdate iu)
|
|||
|
||||
if ( ! iu.valid() )
|
||||
{
|
||||
reporter->Warning("received invalid broker IdentifierUpdate: %s",
|
||||
broker::to_string(iu).data());
|
||||
zeek::reporter->Warning("received invalid broker IdentifierUpdate: %s",
|
||||
broker::to_string(iu).data());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1385,8 +1386,8 @@ bool Manager::ProcessIdentifierUpdate(broker::zeek::IdentifierUpdate iu)
|
|||
|
||||
if ( ! id )
|
||||
{
|
||||
reporter->Warning("Received id-update request for unkown id: %s",
|
||||
id_name.c_str());
|
||||
zeek::reporter->Warning("Received id-update request for unkown id: %s",
|
||||
id_name.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1394,8 +1395,8 @@ bool Manager::ProcessIdentifierUpdate(broker::zeek::IdentifierUpdate iu)
|
|||
|
||||
if ( ! val )
|
||||
{
|
||||
reporter->Error("Failed to receive ID with unsupported type: %s (%s)",
|
||||
id_name.c_str(), zeek::type_name(id->GetType()->Tag()));
|
||||
zeek::reporter->Error("Failed to receive ID with unsupported type: %s (%s)",
|
||||
id_name.c_str(), zeek::type_name(id->GetType()->Tag()));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1433,7 +1434,7 @@ void Manager::ProcessStatus(broker::status stat)
|
|||
break;
|
||||
|
||||
default:
|
||||
reporter->Warning("Unhandled Broker status: %s", to_string(stat).data());
|
||||
zeek::reporter->Warning("Unhandled Broker status: %s", to_string(stat).data());
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1489,7 +1490,7 @@ void Manager::ProcessError(broker::error err)
|
|||
ec = static_cast<BifEnum::Broker::ErrorCode>(err.code());
|
||||
else
|
||||
{
|
||||
reporter->Warning("Unknown Broker error code %u: mapped to unspecificed enum value ", err.code());
|
||||
zeek::reporter->Warning("Unknown Broker error code %u: mapped to unspecificed enum value ", err.code());
|
||||
ec = BifEnum::Broker::ErrorCode::UNSPECIFIED;
|
||||
}
|
||||
|
||||
|
|
@ -1515,8 +1516,8 @@ void Manager::ProcessStoreResponse(StoreHandleVal* s, broker::store::response re
|
|||
|
||||
if ( request == pending_queries.end() )
|
||||
{
|
||||
reporter->Warning("unmatched response to query %" PRIu64 " on store %s",
|
||||
response.id, s->store.name().c_str());
|
||||
zeek::reporter->Warning("unmatched response to query %" PRIu64 " on store %s",
|
||||
response.id, s->store.name().c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1545,8 +1546,8 @@ void Manager::ProcessStoreResponse(StoreHandleVal* s, broker::store::response re
|
|||
else if ( response.answer.error() == broker::ec::no_such_key )
|
||||
request->second->Result(query_result());
|
||||
else
|
||||
reporter->InternalWarning("unknown store response status: %s",
|
||||
to_string(response.answer.error()).c_str());
|
||||
zeek::reporter->InternalWarning("unknown store response status: %s",
|
||||
to_string(response.answer.error()).c_str());
|
||||
|
||||
delete request->second;
|
||||
pending_queries.erase(request);
|
||||
|
|
@ -1634,7 +1635,7 @@ void Manager::BrokerStoreToZeekTable(const std::string& name, const StoreHandleV
|
|||
auto zeek_key = data_to_val(key, its[0].get());
|
||||
if ( ! zeek_key )
|
||||
{
|
||||
reporter->Error("Failed to convert key \"%s\" while importing broker store to table for store \"%s\". Aborting import.", to_string(key).c_str(), name.c_str());
|
||||
zeek::reporter->Error("Failed to convert key \"%s\" while importing broker store to table for store \"%s\". Aborting import.", to_string(key).c_str(), name.c_str());
|
||||
// just abort - this probably means the types are incompatible
|
||||
table->EnableChangeNotifications();
|
||||
return;
|
||||
|
|
@ -1649,7 +1650,7 @@ void Manager::BrokerStoreToZeekTable(const std::string& name, const StoreHandleV
|
|||
auto value = handle->store.get(key);
|
||||
if ( ! value )
|
||||
{
|
||||
reporter->Error("Failed to load value for key %s while importing Broker store %s to table", to_string(key).c_str(), name.c_str());
|
||||
zeek::reporter->Error("Failed to load value for key %s while importing Broker store %s to table", to_string(key).c_str(), name.c_str());
|
||||
table->EnableChangeNotifications();
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1657,7 +1658,7 @@ void Manager::BrokerStoreToZeekTable(const std::string& name, const StoreHandleV
|
|||
auto zeek_value = data_to_val(*value, table->GetType()->Yield().get());
|
||||
if ( ! zeek_value )
|
||||
{
|
||||
reporter->Error("Could not convert %s to table value while trying to import Broker store %s. Aborting import.", to_string(value).c_str(), name.c_str());
|
||||
zeek::reporter->Error("Could not convert %s to table value while trying to import Broker store %s. Aborting import.", to_string(value).c_str(), name.c_str());
|
||||
table->EnableChangeNotifications();
|
||||
return;
|
||||
}
|
||||
|
|
@ -1760,7 +1761,7 @@ bool Manager::AddForwardedStore(const std::string& name, zeek::TableValPtr table
|
|||
{
|
||||
if ( forwarded_stores.find(name) != forwarded_stores.end() )
|
||||
{
|
||||
reporter->Error("same &broker_store %s specified for two different variables", name.c_str());
|
||||
zeek::reporter->Error("same &broker_store %s specified for two different variables", name.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue