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

Merge pull request #3725 

9cc0d42 connection_context: remove state_ prefix from state names (moneromooo-monero)
d9d002c daemon: print peer state in sync_info (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-16 14:01:12 -05:00
parent 53b5d03b82 d9d002c3c1
commit 42e7f31613
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cryptonote_basic/connection_context.h
View File

@ -67,15 +67,15 @@ namespace cryptonote
switch (s) switch (s)
{ {
case cryptonote_connection_context::state_before_handshake: case cryptonote_connection_context::state_before_handshake:
return "state_before_handshake"; return "before_handshake";
case cryptonote_connection_context::state_synchronizing: case cryptonote_connection_context::state_synchronizing:
return "state_synchronizing"; return "synchronizing";
case cryptonote_connection_context::state_standby: case cryptonote_connection_context::state_standby:
return "state_standby"; return "standby";
case cryptonote_connection_context::state_idle: case cryptonote_connection_context::state_idle:
return "state_idle"; return "idle";
case cryptonote_connection_context::state_normal: case cryptonote_connection_context::state_normal:
return "state_normal"; return "normal";
default: default:
return "unknown"; return "unknown";
} }

2
src/daemon/rpc_command_executor.cpp
View File

@ -1895,7 +1895,7 @@ bool t_rpc_command_executor::sync_info()
for (const auto &s: res.spans) for (const auto &s: res.spans)
if (s.rate > 0.0f && s.connection_id == p.info.connection_id) if (s.rate > 0.0f && s.connection_id == p.info.connection_id)
nblocks += s.nblocks, size += s.size; nblocks += s.nblocks, size += s.size;
tools::success_msg_writer() << address << " " << epee::string_tools::pad_string(p.info.peer_id, 16, '0', true) << " " << p.info.height << " " << p.info.current_download << " kB/s, " << nblocks << " blocks / " << size/1e6 << " MB queued"; tools::success_msg_writer() << address << " " << epee::string_tools::pad_string(p.info.peer_id, 16, '0', true) << " " << epee::string_tools::pad_string(p.info.state, 16) << " " << p.info.height << " " << p.info.current_download << " kB/s, " << nblocks << " blocks / " << size/1e6 << " MB queued";
} }
uint64_t total_size = 0; uint64_t total_size = 0;