such-gitea/wownero-lws
1
0
Fork 1
mirror of https://codeberg.org/wownero/wownero-lws synced 2026-01-11 08:05:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Check for JSON-RPC errors, and add better logging for it

Browse Source
This commit is contained in:
Lee Clagett
2021-03-03 23:27:22 -05:00
parent 01b269e3ca
commit 1766276aad
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/rpc/client.h
View File

@@ -38,6 +38,7 @@
#include "rpc/message.h" // monero/src
#include "rpc/daemon_pub.h"
#include "rpc/rates.h"
#include "util/source_location.h"
namespace lws
{
@@ -70,6 +71,9 @@ namespace rpc
: ctx(std::move(ctx)), daemon(), daemon_sub(), signal_sub()
{}
//! Expect `response` as the next message payload unless error.
expect<void> get_response(cryptonote::rpc::Message& response, std::chrono::seconds timeout, source_location loc);
public:
//! A client with no connection (all send/receive functions fail).
explicit client() noexcept
@@ -125,18 +129,13 @@ namespace rpc
//! \return Next available RPC message response from server
expect<std::string> get_message(std::chrono::seconds timeout);
//! \return RPC response `M`, waiting a max of `timeout` seconds.
//! \return RPC response `M`, waiting a max of `timeout` seconds. Log errors as from `loc`.
template<typename M>
expect<M> receive(std::chrono::seconds timeout)
expect<M> receive(const std::chrono::seconds timeout, const source_location loc = {})
{
expect<std::string> message = get_message(timeout);
if (!message)
return message.error();
cryptonote::rpc::FullMessage fm{std::move(*message)};
M out{};
out.fromJson(fm.getMessage());
return out;
M response{};
MONERO_CHECK(get_response(response, timeout, loc));
return response;
}
/*!