Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpc_client: Fix error handling 

Previous code was unable to distingush between a connection error
and a communication error.
This commit is contained in:
Erik de Castro Lopo 2018-01-21 14:12:30 +11:00
parent 8f30350d03
commit ece9bcf5c6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/rpc_client.h
View File

@ -72,10 +72,10 @@ namespace tools
fail_msg_writer() << "Couldn't connect to daemon: " << m_http_client.get_host() << ":" << m_http_client.get_port(); fail_msg_writer() << "Couldn't connect to daemon: " << m_http_client.get_host() << ":" << m_http_client.get_port();
return false; return false;
} }
ok = ok && epee::net_utils::invoke_http_json_rpc("/json_rpc", method_name, req, res, m_http_client, t_http_connection::TIMEOUT()); ok = epee::net_utils::invoke_http_json_rpc("/json_rpc", method_name, req, res, m_http_client, t_http_connection::TIMEOUT());
if (!ok) if (!ok)
{ {
fail_msg_writer() << "Daemon request failed"; fail_msg_writer() << "basic_json_rpc_request: Daemon request failed";
return false; return false;
} }
else else
@ -95,15 +95,15 @@ namespace tools
t_http_connection connection(&m_http_client); t_http_connection connection(&m_http_client);
bool ok = connection.is_open(); bool ok = connection.is_open();
ok = ok && epee::net_utils::invoke_http_json_rpc("/json_rpc", method_name, req, res, m_http_client, t_http_connection::TIMEOUT());
if (!ok) if (!ok)
{ {
fail_msg_writer() << "Couldn't connect to daemon: " << m_http_client.get_host() << ":" << m_http_client.get_port(); fail_msg_writer() << "Couldn't connect to daemon: " << m_http_client.get_host() << ":" << m_http_client.get_port();
return false; return false;
} }
else if (res.status != CORE_RPC_STATUS_OK) // TODO - handle CORE_RPC_STATUS_BUSY ? ok = epee::net_utils::invoke_http_json_rpc("/json_rpc", method_name, req, res, m_http_client, t_http_connection::TIMEOUT());
if (!ok || res.status != CORE_RPC_STATUS_OK) // TODO - handle CORE_RPC_STATUS_BUSY ?
{ {
fail_msg_writer() << fail_msg << " -- " << res.status; fail_msg_writer() << fail_msg << " -- json_rpc_request: " << res.status;
return false; return false;
} }
else else
@ -123,15 +123,15 @@ namespace tools
t_http_connection connection(&m_http_client); t_http_connection connection(&m_http_client);
bool ok = connection.is_open(); bool ok = connection.is_open();
ok = ok && epee::net_utils::invoke_http_json(relative_url, req, res, m_http_client, t_http_connection::TIMEOUT());
if (!ok) if (!ok)
{ {
fail_msg_writer() << "Couldn't connect to daemon: " << m_http_client.get_host() << ":" << m_http_client.get_port(); fail_msg_writer() << "Couldn't connect to daemon: " << m_http_client.get_host() << ":" << m_http_client.get_port();
return false; return false;
} }
else if (res.status != CORE_RPC_STATUS_OK) // TODO - handle CORE_RPC_STATUS_BUSY ? ok = epee::net_utils::invoke_http_json(relative_url, req, res, m_http_client, t_http_connection::TIMEOUT());
if (!ok || res.status != CORE_RPC_STATUS_OK) // TODO - handle CORE_RPC_STATUS_BUSY ?
{ {
fail_msg_writer() << fail_msg << " -- " << res.status; fail_msg_writer() << fail_msg << "-- rpc_request: " << res.status;
return false; return false;
} }
else else