4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

debug logs: add peer group to peerlist

Browse Source
This commit is contained in:
malinero 2021-09-05 02:10:04 +02:00
parent 167a549884
commit 4159aa51bd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p2p/net_node.inl
View File

@ -2164,7 +2164,7 @@ namespace nodetool
} }
LOG_DEBUG_CC(context, "REMOTE PEERLIST: remote peerlist size=" << peerlist_.size()); LOG_DEBUG_CC(context, "REMOTE PEERLIST: remote peerlist size=" << peerlist_.size());
LOG_TRACE_CC(context, "REMOTE PEERLIST: " << ENDL << print_peerlist_to_string(peerlist_)); LOG_TRACE_CC(context, "REMOTE PEERLIST: " << ENDL << print_peerlist_to_string(peerlist_, m_asmap));
CRITICAL_REGION_LOCAL(m_blocked_hosts_lock); CRITICAL_REGION_LOCAL(m_blocked_hosts_lock);
return m_network_zones.at(context.m_remote_address.get_zone()).m_peerlist.merge_peerlist(peerlist_, [this](const peerlist_entry &pe) { return m_network_zones.at(context.m_remote_address.get_zone()).m_peerlist.merge_peerlist(peerlist_, [this](const peerlist_entry &pe) {
return !is_addr_recently_failed(pe.adr) && is_remote_host_allowed(pe.adr); return !is_addr_recently_failed(pe.adr) && is_remote_host_allowed(pe.adr);
@ -2614,7 +2614,7 @@ namespace nodetool
std::vector<peerlist_entry> pl_gray; std::vector<peerlist_entry> pl_gray;
for (auto& zone : m_network_zones) for (auto& zone : m_network_zones)
zone.second.m_peerlist.get_peerlist(pl_gray, pl_white); zone.second.m_peerlist.get_peerlist(pl_gray, pl_white);
MINFO(ENDL << "Peerlist white:" << ENDL << print_peerlist_to_string(pl_white) << ENDL << "Peerlist gray:" << ENDL << print_peerlist_to_string(pl_gray) ); MINFO(ENDL << "Peerlist white:" << ENDL << print_peerlist_to_string(pl_white, m_asmap) << ENDL << "Peerlist gray:" << ENDL << print_peerlist_to_string(pl_gray, m_asmap) );
return true; return true;
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------

4
src/p2p/p2p_protocol_defs.h
View File

@ -37,6 +37,7 @@
#include "net/net_utils_base.h" #include "net/net_utils_base.h"
#include "net/tor_address.h" // needed for serialization #include "net/tor_address.h" // needed for serialization
#include "net/i2p_address.h" // needed for serialization #include "net/i2p_address.h" // needed for serialization
#include "net/group.h"
#include "misc_language.h" #include "misc_language.h"
#include "string_tools.h" #include "string_tools.h"
#include "time_helper.h" #include "time_helper.h"
@ -143,7 +144,7 @@ namespace nodetool
#pragma pack(pop) #pragma pack(pop)
inline inline
std::string print_peerlist_to_string(const std::vector<peerlist_entry>& pl) std::string print_peerlist_to_string(const std::vector<peerlist_entry>& pl, const std::vector<bool> &asmap)
{ {
time_t now_time = 0; time_t now_time = 0;
time(&now_time); time(&now_time);
@ -156,6 +157,7 @@ namespace nodetool
<< " \trpc credits per hash " << (pe.rpc_credits_per_hash > 0 ? std::to_string(pe.rpc_credits_per_hash) : "-") << " \trpc credits per hash " << (pe.rpc_credits_per_hash > 0 ? std::to_string(pe.rpc_credits_per_hash) : "-")
<< " \tpruning seed " << pe.pruning_seed << " \tpruning seed " << pe.pruning_seed
<< " \tlast_seen: " << (pe.last_seen == 0 ? std::string("never") : epee::misc_utils::get_time_interval_string(now_time - pe.last_seen)) << " \tlast_seen: " << (pe.last_seen == 0 ? std::string("never") : epee::misc_utils::get_time_interval_string(now_time - pe.last_seen))
<< " \tbucket: " << net::group::get_group(pe.adr, asmap)
<< std::endl; << std::endl;
} }
return ss.str(); return ss.str();