rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-12-24 22:27:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: fix merge error removing the "never seen before" timestamp check

Browse source
This commit is contained in:
moneromooo-monero 2019-08-20 12:48:55 +00:00
parent c9df9d683a
commit 5a4c6cc3a8
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
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);