Merge remote-tracking branch 'upstream/master'

6 files changed, 10 insertions, 9 deletions

diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
index 44f50afa2..42adc7c43 100644
--- a/contrib/epee/include/misc_log_ex.h
+++ b/contrib/epee/include/misc_log_ex.h
@@ -1385,6 +1385,7 @@ POP_WARNINGS
 #define LOG_PRINT_MAGENTA(mess, level)       LOG_PRINT_COLOR2(LOG_DEFAULT_TARGET, mess, level, epee::log_space::console_color_magenta)
 
 #define LOG_PRINT_RED_L0(mess)    LOG_PRINT_COLOR2(LOG_DEFAULT_TARGET, mess, LOG_LEVEL_0, epee::log_space::console_color_red)
+#define LOG_PRINT_RED_L1(mess)    LOG_PRINT_COLOR2(LOG_DEFAULT_TARGET, mess, LOG_LEVEL_1, epee::log_space::console_color_red)
 
 #define LOG_PRINT_L0(mess)        LOG_PRINT(mess, LOG_LEVEL_0)
 #define LOG_PRINT_L1(mess)        LOG_PRINT(mess, LOG_LEVEL_1)
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 403f5a3bd..4b4189eb4 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -376,7 +376,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
 
     if (e)
     {
-      LOG_PRINT_L0("[sock " << socket_.native_handle() << "] Some problems at write: " << e.message() << ':' << e.value());
+      LOG_PRINT_L1("[sock " << socket_.native_handle() << "] Some problems at write: " << e.message() << ':' << e.value());
       shutdown();
       return;
     }
diff --git a/contrib/epee/include/net/abstract_tcp_server_cp.inl b/contrib/epee/include/net/abstract_tcp_server_cp.inl
index 5673c50be..a582c660a 100644
--- a/contrib/epee/include/net/abstract_tcp_server_cp.inl
+++ b/contrib/epee/include/net/abstract_tcp_server_cp.inl
@@ -602,4 +602,4 @@ bool cp_server_impl<TProtocol>::is_stop_signal()
 }
 //-------------------------------------------------------------
 }
-}
\ No newline at end of file
+}
diff --git a/contrib/epee/include/net/levin_client.inl b/contrib/epee/include/net/levin_client.inl
index ae159da6e..a802d55fa 100644
--- a/contrib/epee/include/net/levin_client.inl
+++ b/contrib/epee/include/net/levin_client.inl
@@ -95,7 +95,7 @@ int levin_client_impl::invoke(int command, const std::string& in_buff, std::stri
 
 	if(head.m_signature!=LEVIN_SIGNATURE) 
 	{
-		LOG_PRINT_L0("Signature missmatch in response");
+		LOG_PRINT_L1("Signature missmatch in response");
 		return -1;
 	}
 	
@@ -156,7 +156,7 @@ inline
 
   if(head.m_signature!=LEVIN_SIGNATURE) 
   {
-    LOG_PRINT_L0("Signature missmatch in response");
+    LOG_PRINT_L1("Signature missmatch in response");
     return -1;
   }
 
@@ -191,4 +191,4 @@ inline
 
 }
 }
-//------------------------------------------------------------------------------
\ No newline at end of file
+//------------------------------------------------------------------------------
diff --git a/contrib/epee/include/net/net_parse_helpers.h b/contrib/epee/include/net/net_parse_helpers.h
index 586dac98d..ce6ca60dc 100644
--- a/contrib/epee/include/net/net_parse_helpers.h
+++ b/contrib/epee/include/net/net_parse_helpers.h
@@ -103,7 +103,7 @@ namespace net_utils
     boost::smatch result;	
     if(!boost::regex_search(uri, result, rexp_match_uri, boost::match_default) && result[0].matched)
     {
-      LOG_PRINT_L0("[PARSE URI] regex not matched for uri: " << uri);
+      LOG_PRINT_L1("[PARSE URI] regex not matched for uri: " << uri);
       content.m_path = uri;
       return true;
     }
@@ -139,7 +139,7 @@ namespace net_utils
     boost::smatch result;	
     if(!boost::regex_search(url_str, result, rexp_match_uri, boost::match_default) && result[0].matched)
     {
-      LOG_PRINT_L0("[PARSE URI] regex not matched for uri: " << rexp_match_uri);
+      LOG_PRINT_L1("[PARSE URI] regex not matched for uri: " << rexp_match_uri);
       //content.m_path = uri;
       return true;
     }
@@ -165,4 +165,4 @@ namespace net_utils
   }
 
 }
-}
\ No newline at end of file
+}
diff --git a/contrib/epee/include/net/net_utils_base.h b/contrib/epee/include/net/net_utils_base.h
index b5619bab3..f61a2a086 100644
--- a/contrib/epee/include/net/net_utils_base.h
+++ b/contrib/epee/include/net/net_utils_base.h
@@ -143,7 +143,7 @@ namespace net_utils
 #define LOG_PRINT_CC_YELLOW(ct, message, log_level) LOG_PRINT_YELLOW("[" << epee::net_utils::print_connection_context_short(ct) << "]" << message, log_level)
 #define LOG_PRINT_CC_CYAN(ct, message, log_level) LOG_PRINT_CYAN("[" << epee::net_utils::print_connection_context_short(ct) << "]" << message, log_level)
 #define LOG_PRINT_CC_MAGENTA(ct, message, log_level) LOG_PRINT_MAGENTA("[" << epee::net_utils::print_connection_context_short(ct) << "]" << message, log_level)
-#define LOG_ERROR_CC(ct, message) LOG_ERROR("[" << epee::net_utils::print_connection_context_short(ct) << "]" << message)
+#define LOG_ERROR_CC(ct, message) LOG_PRINT_RED("[" << epee::net_utils::print_connection_context_short(ct) << "]" << message, LOG_LEVEL_1)
 
 #define LOG_PRINT_CC_L0(ct, message) LOG_PRINT_L0("[" << epee::net_utils::print_connection_context_short(ct) << "]" << message)
 #define LOG_PRINT_CC_L1(ct, message) LOG_PRINT_L1("[" << epee::net_utils::print_connection_context_short(ct) << "]" << message)