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

cluster/zeromq: Catch log_push.send() exception

Browse source
This commit is contained in:
Arne Welzel 2025-03-04 15:36:04 +01:00
parent b82dcfafa4
commit eb1f9f9a42
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cluster/backend/zeromq/ZeroMQ.cc
View file

@ -347,13 +347,19 @@ bool ZeroMQBackend::DoPublishLogWrites(const logging::detail::LogWriteHeader& he
zmq::const_buffer{buf.data(), buf.size()}, zmq::const_buffer{buf.data(), buf.size()},
}; };
zmq::send_result_t result;
for ( size_t i = 0; i < parts.size(); i++ ) { for ( size_t i = 0; i < parts.size(); i++ ) {
zmq::send_flags flags = zmq::send_flags::dontwait; zmq::send_flags flags = zmq::send_flags::dontwait;
if ( i < parts.size() - 1 ) if ( i < parts.size() - 1 )
flags = flags | zmq::send_flags::sndmore; flags = flags | zmq::send_flags::sndmore;
result = log_push.send(parts[i], flags); zmq::send_result_t result;
try {
result = log_push.send(parts[i], flags);
} catch ( const zmq::error_t& err ) {
zeek::reporter->Error("Failed to send log write part %zu: %s", i, err.what());
return false;
}
if ( ! result ) { if ( ! result ) {
// XXX: Not exactly clear what we should do if we reach HWM. // XXX: Not exactly clear what we should do if we reach HWM.
// we could block and hope a logger comes along that empties // we could block and hope a logger comes along that empties