diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-15 18:49:48 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-15 18:49:48 +0200 |
| commit | f1bee553b1e6d25f366d728ba0ce55f7d908efeb (patch) | |
| tree | 393289ec066df3cc033f6fa116e7c723d47dd39d /contrib | |
| parent | Merge pull request #2600 (diff) | |
| parent | frob level 1 logs a bit for consistency (diff) | |
| download | monero-f1bee553b1e6d25f366d728ba0ce55f7d908efeb.tar.xz | |
Merge pull request #2602
bc1b9333 frob level 1 logs a bit for consistency (moneromooo-monero)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/misc_log_ex.h | 6 | ||||
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 4 | ||||
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h index 982aaea06..7ac07d112 100644 --- a/contrib/epee/include/misc_log_ex.h +++ b/contrib/epee/include/misc_log_ex.h @@ -105,9 +105,9 @@ #define _dbg2(x) MDEBUG(x) #define _dbg1(x) MDEBUG(x) #define _info(x) MINFO(x) -#define _note(x) MINFO(x) -#define _fact(x) MINFO(x) -#define _mark(x) MINFO(x) +#define _note(x) MDEBUG(x) +#define _fact(x) MDEBUG(x) +#define _mark(x) MDEBUG(x) #define _warn(x) MWARNING(x) #define _erro(x) MERROR(x) diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 94ef7c3b3..00d03567c 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -80,7 +80,7 @@ PRAGMA_WARNING_DISABLE_VS(4355) m_throttle_speed_in("speed_in", "throttle_speed_in"), m_throttle_speed_out("speed_out", "throttle_speed_out") { - MINFO("test, connection constructor set m_connection_type="<<m_connection_type); + MDEBUG("test, connection constructor set m_connection_type="<<m_connection_type); } PRAGMA_WARNING_DISABLE_VS(4355) //--------------------------------------------------------------------------------- @@ -264,7 +264,7 @@ PRAGMA_WARNING_DISABLE_VS(4355) address = endpoint.address().to_string(); port = boost::lexical_cast<std::string>(endpoint.port()); } - MINFO(" connection type " << to_string( m_connection_type ) << " " + MDEBUG(" connection type " << to_string( m_connection_type ) << " " << socket_.local_endpoint().address().to_string() << ":" << socket_.local_endpoint().port() << " <--> " << address << ":" << port); } diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index cfb2b7b15..74b7dd2f4 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -94,7 +94,7 @@ static const char *get_default_categories(int level) categories = "*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO,msgwriter:INFO"; break; case 1: - categories = "*:WARNING,global:INFO,stacktrace:INFO,logging:INFO,msgwriter:INFO"; + categories = "*:INFO,global:INFO,stacktrace:INFO,logging:INFO,msgwriter:INFO"; break; case 2: categories = "*:DEBUG"; |