d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

daemon: do not display uptime when not known

Browse source
This commit is contained in:
moneromooo-monero 2018-10-01 21:25:56 +00:00 committed by wowario
parent 332ac6a03a
commit dc1e56d815
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/daemon/rpc_command_executor.cpp
View file

@ -438,7 +438,8 @@ bool t_rpc_command_executor::show_status() {
} }
} }
tools::success_msg_writer() << boost::format("Height: %llu/%llu (%.1f%%) on %s%s, %s, net hash %s, v%u%s, %s, %u(out)+%u(in) connections, uptime %ud %uh %um %us") std::stringstream str;
str << boost::format("Height: %llu/%llu (%.1f%%) on %s%s, %s, net hash %s, v%u%s, %s, %u(out)+%u(in) connections")
% (unsigned long long)ires.height % (unsigned long long)ires.height
% (unsigned long long)net_height % (unsigned long long)net_height
% get_sync_percentage(ires) % get_sync_percentage(ires)
@ -451,11 +452,20 @@ bool t_rpc_command_executor::show_status() {
% (hfres.state == cryptonote::HardFork::Ready ? "up to date" : hfres.state == cryptonote::HardFork::UpdateNeeded ? "update needed" : "out of date, likely forked") % (hfres.state == cryptonote::HardFork::Ready ? "up to date" : hfres.state == cryptonote::HardFork::UpdateNeeded ? "update needed" : "out of date, likely forked")
% (unsigned)ires.outgoing_connections_count % (unsigned)ires.outgoing_connections_count
% (unsigned)ires.incoming_connections_count % (unsigned)ires.incoming_connections_count
;
// restricted RPC does not disclose start time
if (ires.start_time)
{
str << boost::format(", uptime %ud %uh %um %us")
% (unsigned int)floor(uptime / 60.0 / 60.0 / 24.0) % (unsigned int)floor(uptime / 60.0 / 60.0 / 24.0)
% (unsigned int)floor(fmod((uptime / 60.0 / 60.0), 24.0)) % (unsigned int)floor(fmod((uptime / 60.0 / 60.0), 24.0))
% (unsigned int)floor(fmod((uptime / 60.0), 60.0)) % (unsigned int)floor(fmod((uptime / 60.0), 60.0))
% (unsigned int)fmod(uptime, 60.0) % (unsigned int)fmod(uptime, 60.0)
; ;
}
tools::success_msg_writer() << str.str();
return true; return true;
} }