rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 18:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2170

Browse source 
c3bb6bec daemon: fix status in command line mode if using restricted rpc (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-07-19 11:51:35 +02:00
commit c0f155d3a0
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/daemon/rpc_command_executor.cpp
View file

@ -369,6 +369,7 @@ bool t_rpc_command_executor::show_status() {
cryptonote::COMMAND_RPC_MINING_STATUS::request mreq; cryptonote::COMMAND_RPC_MINING_STATUS::request mreq;
cryptonote::COMMAND_RPC_MINING_STATUS::response mres; cryptonote::COMMAND_RPC_MINING_STATUS::response mres;
epee::json_rpc::error error_resp; epee::json_rpc::error error_resp;
bool has_mining_info = true;
std::string fail_message = "Problem fetching info"; std::string fail_message = "Problem fetching info";
@ -384,10 +385,8 @@ bool t_rpc_command_executor::show_status() {
{ {
return true; return true;
} }
if (!m_rpc_client->rpc_request(mreq, mres, "/mining_status", fail_message.c_str())) // mining info is only available non unrestricted RPC mode
{ has_mining_info = m_rpc_client->rpc_request(mreq, mres, "/mining_status", fail_message.c_str());
return true;
}
} }
else else
{ {
@ -425,7 +424,7 @@ bool t_rpc_command_executor::show_status() {
% (unsigned long long)(ires.target_height >= ires.height ? ires.target_height : ires.height) % (unsigned long long)(ires.target_height >= ires.height ? ires.target_height : ires.height)
% get_sync_percentage(ires) % get_sync_percentage(ires)
% (ires.testnet ? "testnet" : "mainnet") % (ires.testnet ? "testnet" : "mainnet")
% (mining_busy ? "syncing" : mres.active ? ( ( mres.is_background_mining_enabled ? "smart " : "" ) + std::string("mining at ") + get_mining_speed(mres.speed) ) : "not mining") % (!has_mining_info ? "mining info unavailable" : mining_busy ? "syncing" : mres.active ? ( ( mres.is_background_mining_enabled ? "smart " : "" ) + std::string("mining at ") + get_mining_speed(mres.speed) ) : "not mining")
% get_mining_speed(ires.difficulty / ires.target) % get_mining_speed(ires.difficulty / ires.target)
% (unsigned)hfres.version % (unsigned)hfres.version
% get_fork_extra_info(hfres.earliest_height, ires.height, ires.target) % get_fork_extra_info(hfres.earliest_height, ires.height, ires.target)