log相关更改

Author: tkzcfc

common/net_uv/base/Common.cpp

@@ -9,6 +9,7 @@ NS_NET_UV_BEGIN
 
 typedef void(*uvOutputLoggerType)(int32_t, const char*);
 uvOutputLoggerType uvOutputLogger = 0;
+int32_t uvLoggerLevel = NET_UV_L_DEFAULT_LEVEL;
 
 
 static const char* net_uv_log_name[NET_UV_L_FATAL + 1] =
@@ -22,7 +23,7 @@ static const char* net_uv_log_name[NET_UV_L_FATAL + 1] =
 
 void net_uvLog(int32_t level, const char* format, ...)
 {
-	if (level < NET_UV_L_MIN_LEVEL)
+	if (level < uvLoggerLevel)
 	{
 		return;
 	}
@@ -34,19 +35,19 @@ void net_uvLog(int32_t level, const char* format, ...)
 	vsnprintf(buf, sizeof(buf), format, args);
 	va_end(args);
 
-	std::string str = net_getTime();
-	str.append("[NET-UV]-[");
-	str.append(net_uv_log_name[level]);
-	str.append("] ");
-	str.append(buf);
-	str.append("\n");
-	if (uvOutputLogger == NULL)
+	if (uvOutputLogger != NULL)
 	{
-		printf("%s", str.c_str());
+		uvOutputLogger(level, buf);
 	}
 	else
 	{
-		uvOutputLogger(level, buf);
+		std::string str = net_getTime();
+		str.append("[NET-UV]-[");
+		str.append(net_uv_log_name[level]);
+		str.append("] ");
+		str.append(buf);
+		str.append("\n");
+		printf("%s", str.c_str());
 	}
 
 	//va_list list;
@@ -56,6 +57,11 @@ void net_uvLog(int32_t level, const char* format, ...)
 	//printf("\n");
 }
 
+void net_setLogLevel(int32_t level)
+{
+	uvLoggerLevel = level;
+}
+
 void setNetUVLogPrintFunc(void(*func)(int32_t, const char*))
 {
 	uvOutputLogger = func;

common/net_uv/base/Common.h

@@ -43,7 +43,7 @@ void printMemInfo();
 
 #define printMemInfo() ((void) 0) 
 
-#define NET_UV_LOG(level, format, ...) ((void) 0) 
+#define NET_UV_LOG(level, format, ...) net_uvLog(level, format, ##__VA_ARGS__)
 
 #endif // !OPEN_NET_UV_DEBUG
 
@@ -64,6 +64,9 @@ void printMemInfo();
 //日志输出
 void net_uvLog(int32_t level, const char* format, ...);
 
+// 设置日志输出等级
+void net_setLogLevel(int32_t level);
+
 //设置日志输出函数
 void setNetUVLogPrintFunc(void(*func)(int32_t, const char*));
 

common/net_uv/base/Config.h

@@ -16,7 +16,7 @@
 // 开启内存检测
 #define OPEN_NET_MEM_CHECK 1
 // log输出最低等级
-#define NET_UV_L_MIN_LEVEL NET_UV_L_INFO
+#define NET_UV_L_DEFAULT_LEVEL NET_UV_L_INFO
 
 #else
 
@@ -25,7 +25,7 @@
 // 开启内存检测
 #define OPEN_NET_MEM_CHECK 0
 // log输出最低等级
-#define NET_UV_L_MIN_LEVEL NET_UV_L_ERROR
+#define NET_UV_L_DEFAULT_LEVEL NET_UV_L_ERROR
 
 #endif