monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-22 19:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9052

Browse source 
4acae11 Fix EAGAIN bug in ZMQ-RPC/ZMQ-PUB (Lee *!* Clagett)
This commit is contained in:
luigi1111 2024-01-18 17:57:30 -05:00
commit 9d7b253263
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/rpc/zmq_server.cpp
View file

@ -158,13 +158,22 @@ void ZmqServer::serve()
if (!pub || sockets[2].revents) if (!pub || sockets[2].revents)
{ {
std::string message = MONERO_UNWRAP(net::zmq::receive(rep.get(), read_flags)); expect<std::string> message = net::zmq::receive(rep.get(), read_flags);
MDEBUG("Received RPC request: \"" << message << "\""); if (!message)
epee::byte_slice response = handler.handle(std::move(message)); {
// EAGAIN can occur when using `zmq_poll`, which doesn't inspect for message validity
if (message != net::zmq::make_error_code(EAGAIN))
MONERO_THROW(message.error(), "Read failure on ZMQ-RPC");
}
else // no errors
{
MDEBUG("Received RPC request: \"" << *message << "\"");
epee::byte_slice response = handler.handle(std::move(*message));
const boost::string_ref response_view{reinterpret_cast<const char*>(response.data()), response.size()}; const boost::string_ref response_view{reinterpret_cast<const char*>(response.data()), response.size()};
MDEBUG("Sending RPC reply: \"" << response_view << "\""); MDEBUG("Sending RPC reply: \"" << response_view << "\"");
MONERO_UNWRAP(net::zmq::send(std::move(response), rep.get())); MONERO_UNWRAP(net::zmq::send(std::move(response), rep.get()));
}
} }
} }
} }