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 #5830 

5a4c6cc daemon: fix merge error removing the 'never seen before' timestamp check (moneromooo-monero)
This commit is contained in:
luigi1111 2019-09-08 19:40:29 -05:00
parent 48d8475b6e 5a4c6cc3a8
commit da4512639e
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/daemon/rpc_command_executor.cpp
View File

@ -66,7 +66,7 @@ namespace {
time(&now); time(&now);
time_t last_seen = static_cast<time_t>(peer.last_seen); time_t last_seen = static_cast<time_t>(peer.last_seen);
std::string elapsed = epee::misc_utils::get_time_interval_string(now - last_seen); std::string elapsed = peer.last_seen == 0 ? "never" : epee::misc_utils::get_time_interval_string(now - last_seen);
std::string id_str = epee::string_tools::pad_string(epee::string_tools::to_string_hex(peer.id), 16, '0', true); std::string id_str = epee::string_tools::pad_string(epee::string_tools::to_string_hex(peer.id), 16, '0', true);
std::string port_str; std::string port_str;
epee::string_tools::xtype_to_string(peer.port, port_str); epee::string_tools::xtype_to_string(peer.port, port_str);