aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanoAkron <nanoakron@users.noreply.github.com>2017-01-30 15:54:36 +0000
committerNanoAkron <nanoakron@users.noreply.github.com>2017-01-31 09:49:32 +0000
commit084aef700bbf99e21f271b833fbe350f7f865cec (patch)
treecbe591f8c4228a88c6982ae03667d54c8fbe2ea5
parentMerge pull request #1618 (diff)
downloadmonero-084aef700bbf99e21f271b833fbe350f7f865cec.tar.xz
Added days uptime to the status message
Also broke down the time calculations for legibility
-rw-r--r--src/daemon/rpc_command_executor.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index 8558ebc17..82951dc89 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -368,7 +368,7 @@ bool t_rpc_command_executor::show_status() {
std::time_t uptime = std::time(nullptr) - ires.start_time;
- tools::success_msg_writer() << boost::format("Height: %llu/%llu (%.1f%%) on %s, %s, net hash %s, v%u%s, %s, %u+%u connections, uptime %uh %um %us")
+ tools::success_msg_writer() << boost::format("Height: %llu/%llu (%.1f%%) on %s, %s, net hash %s, v%u%s, %s, %u+%u connections, uptime %ud %uh %um %us")
% (unsigned long long)ires.height
% (unsigned long long)(ires.target_height >= ires.height ? ires.target_height : ires.height)
% get_sync_percentage(ires)
@@ -378,9 +378,11 @@ bool t_rpc_command_executor::show_status() {
% (unsigned)hfres.version
% get_fork_extra_info(hfres.earliest_height, ires.height, ires.target)
% (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.incoming_connections_count
- % (unsigned int)floor(uptime / 3600.0)
- % (unsigned int)floor(fmod(uptime, 3600.0) / 60.0)
+ % (unsigned)ires.outgoing_connections_count
+ % (unsigned)ires.incoming_connections_count
+ % (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)
% (unsigned int)fmod(uptime, 60.0)
;