Merge branch 'remote_record_st2' into uat

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -595,7 +595,7 @@ void CSalesRecorderEntity::OnRecordFailed(const char* pszMessage, bool bRecordDe
 
 	char strmsg[MAX_PATH] = { 0 };
 	snprintf(strmsg, MAX_PATH, "{%s}.", pszMessage ? pszMessage : " ");
-	LogWarn(Severity_Middle, Error_Debug, LOG_EVT_SALESRECORD_FAILED, strmsg);
+	LogWarn(Severity_Low, Error_Debug, LOG_EVT_SALESRECORD_FAILED, strmsg);
 
 }
 
@@ -1282,7 +1282,7 @@ ErrorCodeEnum CSalesRecorderEntity::HandleStartRecord(const char *pszMessage, co
 
 	char strmsg[MAX_PATH] = { 0 };
 	snprintf(strmsg, MAX_PATH, "start remote record %s.", m_SalesVideoName);
-	LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_REMOTERECORD, strmsg);
+	LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD, strmsg);
 
 	return Error;
 }

Module/mod_counterconnector/callrouter.cpp

@@ -103,7 +103,7 @@ static int request_voipgateway_address(call_info_t *call_info, proxy_rsp_packet_
 	SOCKET client_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	struct timeval timeout = { 2,0 };
 	if (set_socket_attribute(client_socket, timeout)){
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_CONNECT_FAILED, "request_voipgateway_address set_socket_attribute failed.");
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_CONNECT_FAILED, "request_voipgateway_address set_socket_attribute failed.");
 		return ret;
 	}
 	if (INVALID_SOCKET != client_socket){
@@ -114,7 +114,7 @@ static int request_voipgateway_address(call_info_t *call_info, proxy_rsp_packet_
 		memset(sa.sin_zero, 0, sizeof(sa.sin_zero));
 		char strmsg[256] = { 0 };
 		snprintf(strmsg, 256, "dest route addr is %s:%d.", call_info->callroute_server_ip.GetData(), call_info->callroute_server_port);
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_ADDRESS, strmsg);
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_ADDRESS, strmsg);
 		//控制为非阻塞方式
 #ifdef RVC_OS_WIN
 		ioctlsocket(client_socket, FIONBIO, &mode);
@@ -156,7 +156,7 @@ static int request_voipgateway_address(call_info_t *call_info, proxy_rsp_packet_
 #endif // RVC_OS_WIN
 			char strerror[256];
 			snprintf(strerror, 256, "request_voipgateway_address connect callroute server timeout(%d).", errno);
-			LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_CONNECT_FAILED, strerror);
+			LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_CONNECT_FAILED, strerror);
 			return ret;      //超时
 		} 
 		reset_buffer(&req_info, 0x20, sizeof(proxy_req_packet_t));
@@ -171,7 +171,7 @@ static int request_voipgateway_address(call_info_t *call_info, proxy_rsp_packet_
 #else
 			close(client_socket);
 #endif // RVC_OS_WIN
-			LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, "request_voipgateway_address send to callroute server failed.");
+			LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, "request_voipgateway_address send to callroute server failed.");
 			return ret;
 		}
 		ret = recv(client_socket, (char*)rsp_packet, rsp_len, 0);
@@ -182,7 +182,7 @@ static int request_voipgateway_address(call_info_t *call_info, proxy_rsp_packet_
 		close(client_socket);
 #endif // RVC_OS_WIN
 		if (ret <= 0){
-			LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, "request_voipgateway_address recv from callroute server failed.");
+			LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, "request_voipgateway_address recv from callroute server failed.");
 			return ret;
 		}
 	}
@@ -205,7 +205,7 @@ static bool is_response_packet_valid(proxy_rsp_packet_t* packet_info)
 			char strmsg[256] = { 0 };
 			snprintf(strmsg, 256, "get mediaserver address from callroute server failed, rsp packgelen:%s, tradefrom:%s, requestcode:%s!", 
 				packgelen,tradefrom, requestcode);
-			LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strmsg);
+			LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strmsg);
 		}else{
 			bret = true;
 		}
@@ -285,7 +285,7 @@ static node_list_head_t *create_node_list_by_callernum(call_info_t *call_info, p
 					char strmsg[256] = { 0 };
 					snprintf(strmsg, 256,"new callroute node: new_caller_number:%s new_touri:%s, assist_ip:%s, assist_port:%s!", 
 									new_caller_number, new_touri, packet_info->rsp_body.video_content_ip, packet_info->rsp_body.video_content_port);
-					LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strmsg);
+					LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strmsg);
 					add_node_to_list(phead, new_caller_number, new_touri, packet_info->rsp_body.video_content_ip, packet_info->rsp_body.video_content_port);
 				}
 			}
@@ -293,7 +293,7 @@ static node_list_head_t *create_node_list_by_callernum(call_info_t *call_info, p
 	}else{
 		char strerror[256] = { 0 };
 		snprintf(strerror, 256, "create_node_list_by_callernum failed. szbranchno:%s, szcaller_num:%s, szdest_num:%s.", call_info->szbranchno.GetData(), call_info->szcaller_num.GetData(), call_info->szdest_num.GetData());
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strerror);
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strerror);
 	}
 
 	return phead;
@@ -310,7 +310,7 @@ node_list_head_t *get_callroute_list(call_info_t *call_info)
 		call_info->szdest_num.GetLength() == 0 ||
 		call_info->szcaller_num.GetLength() == 0 ||
 		call_info->szbranchno.GetLength() == 0) {
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, "get_callroute_list failed call_info param is null.");
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, "get_callroute_list failed call_info param is null.");
 		return NULL;
 	}
 	reset_buffer(&rsp_info, 0x20, sizeof(proxy_rsp_packet_t));
@@ -318,7 +318,7 @@ node_list_head_t *get_callroute_list(call_info_t *call_info)
 	if (ret <= 0){
 		char strmsg[256] = { 0 };
 		snprintf(strmsg, 256, "get_callroute_list failed szbranchno:%s, szcaller_num:%s, szdest_num:%s.", call_info->szbranchno.GetData(), call_info->szcaller_num.GetData(), call_info->szdest_num.GetData());
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strmsg);
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALLROUTE_FAILED, strmsg);
 		return NULL;
 	}
 	return create_node_list_by_callernum(call_info, &rsp_info);