nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1606

Browse Source 
f8b97aef p2p: show ban/unban logs by default again (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-01-22 11:43:11 -05:00
commit f798a2ab85
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/p2p/net_node.inl
View File

@ -205,7 +205,7 @@ namespace nodetool
if(time(nullptr) >= it->second) if(time(nullptr) >= it->second)
{ {
m_blocked_ips.erase(it); m_blocked_ips.erase(it);
MLOG_CYAN(el::Level::Info, "IP " << epee::string_tools::get_ip_string_from_int32(addr) << " unblocked."); MCLOG_CYAN(el::Level::Info, "global", "IP " << epee::string_tools::get_ip_string_from_int32(addr) << " unblocked.");
return true; return true;
} }
return false; return false;
@ -237,7 +237,7 @@ namespace nodetool
for (const auto &c: conns) for (const auto &c: conns)
m_net_server.get_config_object().close(c); m_net_server.get_config_object().close(c);
MLOG_CYAN(el::Level::Info, "IP " << epee::string_tools::get_ip_string_from_int32(addr) << " blocked."); MCLOG_CYAN(el::Level::Info, "global", "IP " << epee::string_tools::get_ip_string_from_int32(addr) << " blocked.");
return true; return true;
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
@ -249,7 +249,7 @@ namespace nodetool
if (i == m_blocked_ips.end()) if (i == m_blocked_ips.end())
return false; return false;
m_blocked_ips.erase(i); m_blocked_ips.erase(i);
MLOG_CYAN(el::Level::Info, "IP " << epee::string_tools::get_ip_string_from_int32(addr) << " unblocked."); MCLOG_CYAN(el::Level::Info, "global", "IP " << epee::string_tools::get_ip_string_from_int32(addr) << " unblocked.");
return true; return true;
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------