Merge pull request #1723

d43fde8a network_throttle: demote spammy logs to TRACE (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-21 11:26:31 +02:00
commit 98e34ca157
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions

View File

@ -216,7 +216,7 @@ void network_throttle::_handle_trafic_exact(size_t packet_size, size_t orginal_s
std::ostringstream oss; oss << "["; for (auto sample: m_history) oss << sample.m_size << " "; oss << "]" << std::ends; std::ostringstream oss; oss << "["; for (auto sample: m_history) oss << sample.m_size << " "; oss << "]" << std::ends;
std::string history_str = oss.str(); std::string history_str = oss.str();
MDEBUG("Throttle " << m_name << ": packet of ~"<<packet_size<<"b " << " (from "<<orginal_size<<" b)" MTRACE("Throttle " << m_name << ": packet of ~"<<packet_size<<"b " << " (from "<<orginal_size<<" b)"
<< " Speed AVG=" << std::setw(4) << ((long int)(cts .average/1024)) <<"[w="<<cts .window<<"]" << " Speed AVG=" << std::setw(4) << ((long int)(cts .average/1024)) <<"[w="<<cts .window<<"]"
<< " " << std::setw(4) << ((long int)(cts2.average/1024)) <<"[w="<<cts2.window<<"]" << " " << std::setw(4) << ((long int)(cts2.average/1024)) <<"[w="<<cts2.window<<"]"
<<" / " << " Limit="<< ((long int)(m_target_speed/1024)) <<" KiB/sec " <<" / " << " Limit="<< ((long int)(m_target_speed/1024)) <<" KiB/sec "
@ -306,7 +306,7 @@ void network_throttle::calculate_times(size_t packet_size, calculate_times_struc
if (dbg) { if (dbg) {
std::ostringstream oss; oss << "["; for (auto sample: m_history) oss << sample.m_size << " "; oss << "]" << std::ends; std::ostringstream oss; oss << "["; for (auto sample: m_history) oss << sample.m_size << " "; oss << "]" << std::ends;
std::string history_str = oss.str(); std::string history_str = oss.str();
MDEBUG((cts.delay > 0 ? "SLEEP" : "") MTRACE((cts.delay > 0 ? "SLEEP" : "")
<< "dbg " << m_name << ": " << "dbg " << m_name << ": "
<< "speed is A=" << std::setw(8) <<cts.average<<" vs " << "speed is A=" << std::setw(8) <<cts.average<<" vs "
<< "Max=" << std::setw(8) <<M<<" " << "Max=" << std::setw(8) <<M<<" "