瀏覽代碼

Z991239-3624 #comment 调整实体告警级别,由level2改为level1

80274480 3 年之前
父節點
當前提交
f91c1761c7

+ 1 - 1
Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -834,7 +834,7 @@ void CSalesRecorderEntity::StartOnSiteSalesRecord(const int fps, const char* wmv
 
 	if (eStand2Agent == eRecordType || ePad2Agent == eRecordType) {
 		tAudioParams.eOutPutType = eLowDefinition;
-		tAudioParams.bIsNsOn = false;
+		tAudioParams.bIsNsOn = true;
 	}
 
 	Dbg("init lib wmv record success! and record type is %s and output audio quality is %s, audio noise suppression flag is %s. noise suppression policy is %d.", record_type_table[eRecordType], audio_quality_type_table[m_eAudioOutQuality], tAudioParams.bIsNsOn ? "true" : "false", tAudioParams.iNsPolicy);

+ 53 - 53
Module/mod_counterconnector/ConnectorFSM.cpp

@@ -112,7 +112,7 @@ public:
 				if (!m_bSipConnected){
 					char strmsg[MAX_PATH] = { 0 };
 					snprintf(strmsg, MAX_PATH, "sip connect failed for %s.", Msg.status.GetData());
-					LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_SIP_CONNECT_FAILED,strmsg);
+					LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_SIP_CONNECT_FAILED,strmsg);
 				}
 			}
 		}
@@ -203,7 +203,7 @@ ErrorCodeEnum ACMCallFSM::OnInit()
 	Error = m_pPhoneClient->Connect();
 	if (Error != Error_Succeed)
 	{
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_CONNECT_SIPPHONE_ERROR, "connect sip phone error");
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_CONNECT_SIPPHONE_ERROR, "connect sip phone error");
 		goto on_error;
 	}
 	PhoneService_BeginState_Sub PhoneSub;
@@ -225,7 +225,7 @@ ErrorCodeEnum ACMCallFSM::OnInit()
 	Error = m_pChannelClient->Connect();
 	if (Error != Error_Succeed) 
 	{
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_CONNECT_ASSIST_ERROR, "connect assistant channel error");
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_CONNECT_ASSIST_ERROR, "connect assistant channel error");
 		goto on_error;
 	}
 	ChannelService_BeginState_Sub ChannelSub;
@@ -300,7 +300,7 @@ BOOL ACMCallFSM::ReConnectionSipphone()
 		Error = m_pPhoneClient->Connect();
 		if (Error != Error_Succeed) 
 		{
-			LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_CONNECT_SIPPHONE_ERROR, "connect sip phone error");
+			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_CONNECT_SIPPHONE_ERROR, "connect sip phone error");
 			m_pPhoneClient->SafeDelete();
 			Dbg("m_phoneClient connect fail!");
 			return FALSE;
@@ -387,22 +387,22 @@ void ACMCallFSM::OnStateTrans(int iSrcState, int iDstState)
 					snprintf(strmsg, MAX_PATH,"Broadcast state from %d to %d", st1, st2);
 					Dbg(strmsg);
 					SpSendBroadcast(GetEntityBase()->GetFunction(), SP_MSG_OF(PhoneState), SP_MSG_SIG_OF(PhoneState), evt);
-					LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_BROADCAST_CALL_STATE, strmsg);
+					LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_BROADCAST_CALL_STATE, strmsg);
 				} 
 				else{
 					char strinfo[MAX_PATH] = {0};
 					snprintf(strinfo, MAX_PATH,"state from %d to %d, auto reconnect, not broadcast state to ui.", st1, st2);
-					LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_AUTO_RECONNECT,strinfo);
+					LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_AUTO_RECONNECT,strinfo);
 				}
 
 				if (eState_HandFree == st2 || eState_Pickup == st2){
 					if (eState_Connecting == st1){
-						LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CONNECT_SUCCESS, "connect success!");
+						LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CONNECT_SUCCESS, "connect success!");
 					}
 				}
 
 				if (eState_Fail == st1 && eState_Offline == st2){
-					LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CONNECT_FAILED, "connect failed!");
+					LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CONNECT_FAILED, "connect failed!");
 				}
 			}
 			SetCallState(st2);
@@ -460,14 +460,14 @@ unsigned int ACMCallFSM::s0_on_event(FSMEvent* event)
 		memset(&m_CallingParam,0,sizeof(m_CallingParam));  //正常呼叫
 		GetEntityBase()->GetFunction()->SetSysVar(SYSVAR_CALLTYPE, CALLTYPE_NORMAL); // 设置呼叫模式为常规呼叫
 		m_nSysCallType = 0;
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_PICKUPCALL,"begin pickup call");
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_PICKUPCALL,"begin pickup call");
 	} 
 	else if (event->iEvt == USER_EVT_HANDFREE_CALL) 
 	{
 		GetEntityBase()->GetFunction()->SetSysVar(SYSVAR_CALLTYPE,CALLTYPE_NORMAL); // 设置呼叫模式为常规呼叫
 		m_nSysCallType = 0;
 		memset(&m_CallingParam,0,sizeof(m_CallingParam));							// 正常呼叫
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_HANDFREECALL,"begin hand free call");
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_HANDFREECALL,"begin hand free call");
 	}
 	else if (event->iEvt == USER_EVT_COMMAND_CALL)
 	{
@@ -507,7 +507,7 @@ unsigned int ACMCallFSM::s0_on_event(FSMEvent* event)
 		//GetEntityBase()->GetFunction()->SetSysVar(SYSVAR_CALLTYPE,CALLTYPE_RECORD); // 设置呼叫模式为双录呼叫
 		m_nSysCallType = 0;
 		Dbg("start double record call,call type is %d.", m_CallingParam.nCallType);
-		LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_DOUBLERECORDCALL,"begin double record call");
+		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_DOUBLERECORDCALL,"begin double record call");
 	}
 	else if (event->iEvt == USER_EVT_STOPLOACALREMOTEVIDEO) 
 	{
@@ -654,7 +654,7 @@ unsigned int ACMCallFSM::s10_on_event(FSMEvent* event)
 void ACMCallFSM::s11_on_entry() 
 {
 	ErrorCodeEnum Error = Error_Succeed;
-	LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_MAKECALL,"begin make call");
+	LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_MAKECALL,"begin make call");
 	if (m_nCurSipServer == Error_Server){
 		Error = Error_NetBroken;
 	}
@@ -665,7 +665,7 @@ void ACMCallFSM::s11_on_entry()
 		if (m_strCallRouteIP.GetLength() != 0) {
 			callurl_node_t *node = get_no_used_node(m_pCallRouteList);
 			if (node != NULL){
-				LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_HEADOFFICE_CALL, "Begin Head Office Make Call!");
+				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_HEADOFFICE_CALL, "Begin Head Office Make Call!");
 				char ipstr[256] = {0};
 				char callid_str[64] = { 0 };
 				GetLocalIP(ipstr, 64);
@@ -683,11 +683,11 @@ void ACMCallFSM::s11_on_entry()
 				node->bused = TRUE;
 				char strmsg[256] = { 0 };
 				snprintf(strmsg, 256, "head office make call result:0x%08x", Error);
-				LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_HEADOFFICE_CALL, strmsg);
+				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_HEADOFFICE_CALL, strmsg);
 				center_connect = TRUE;
 			}	
 			else{
-				LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_BRANCHMODE_CALL, "head office mode no more call router, try to connect branch server.");
+				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_BRANCHMODE_CALL, "head office mode no more call router, try to connect branch server.");
 				//m_nCurSipServer = MAIN_SERVER;
 				//m_nCurChanServer = MAIN_SERVER;
 				center_connect = FALSE;
@@ -746,16 +746,16 @@ unsigned int ACMCallFSM::s11_on_event(FSMEvent* event)
 			int interval = now - m_nStarttime;
 			char msg[128];
 			sprintf(msg, "sip connecting, customer active hangup after: %d", interval);
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_HANGUP, msg);
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_HANGUP, msg);
 	}
 	else if (event->iEvt == USER_EVT_SIP_STATE_IDLE) 
 	{
 		if (m_nCurSipServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_SIPSTATE_IDLE,"sipphone connect main server failed");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_SIPSTATE_IDLE,"sipphone connect main server failed");
 		}else if (m_nCurSipServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_SIPSTATE_IDLE,"sipphone connect bak server failed");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_SIPSTATE_IDLE,"sipphone connect bak server failed");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_SIPSTATE_IDLE,"sipphone connect error server failed");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_SIPSTATE_IDLE,"sipphone connect error server failed");
 		}
 		m_nCurSipServer?(m_nCurSipServer=Error_Server):(m_nCurSipServer=BACK_SERVER);
 		m_nSipErrorNum++;
@@ -764,33 +764,33 @@ unsigned int ACMCallFSM::s11_on_event(FSMEvent* event)
 	else if (event->iEvt == USER_EVT_ASSISTCHAN_IDEL)
 	{
 		if (m_nCurSipServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_CHANSTATE_IDLE,"chan mod idle, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_CHANSTATE_IDLE,"chan mod idle, main server");
 		}else if (m_nCurSipServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_CHANSTATE_IDLE,"chan mod idle, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_CHANSTATE_IDLE,"chan mod idle, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_CHANSTATE_IDLE,"chan mod idle, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_CHANSTATE_IDLE,"chan mod idle, error server");
 		}
 		ReConnectionAssistchan();
 	}
 	else if (event->iEvt == USER_EVT_SIPPHONE_IDEL)
 	{
 		if (m_nCurSipServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_SIPENTITY_RESTART,"sipphone mod idle, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_SIPENTITY_RESTART,"sipphone mod idle, main server");
 		}else if (m_nCurSipServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_SIPENTITY_RESTART,"sipphone mod idle, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_SIPENTITY_RESTART,"sipphone mod idle, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_SIPENTITY_RESTART,"sipphone mod idle, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_SIPENTITY_RESTART,"sipphone mod idle, error server");
 		}
 		ReConnectionSipphone();
 	}
 	else if (event->iEvt == EVT_TIMER)
 	{
 		if (m_nCurSipServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_TIMEOUT,"sipphone connect timeout, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_TIMEOUT,"sipphone connect timeout, main server");
 		}else if (m_nCurSipServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_TIMEOUT,"sipphone connect timeout, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_TIMEOUT,"sipphone connect timeout, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_TIMEOUT,"sipphone connect timeout, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_TIMEOUT,"sipphone connect timeout, error server");
 		}
 		Dbg("sip call timeout,release call");
 		m_nSipErrorNum++;
@@ -798,11 +798,11 @@ unsigned int ACMCallFSM::s11_on_event(FSMEvent* event)
 	else if (event->iEvt == USER_EVT_JMP_FAIL)
 	{
 		if (m_nCurSipServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_FUNC_FAILED,"sipphone connect func failed, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_SIPCONNECT_FUNC_FAILED,"sipphone connect func failed, main server");
 		}else if (m_nCurSipServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_FUNC_FAILED,"sipphone connect func failed, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_SIPCONNECT_FUNC_FAILED,"sipphone connect func failed, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_FUNC_FAILED,"sipphone connect func failed, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_FUNC_FAILED,"sipphone connect func failed, error server");
 		}
 		m_nSipErrorNum++;
 	}
@@ -868,16 +868,16 @@ unsigned int ACMCallFSM::s12_on_event(FSMEvent* event)
 		int interval = now - m_nStarttime;
 		char msg[128];
 		sprintf(msg, "chan connecting, customer active hangup after: %d", interval);
-		LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_HANGUP, msg);
+		LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_HANGUP, msg);
 	}
 	else if (event->iEvt == USER_EVT_SIP_STATE_IDLE) 
 	{
 		if (m_nCurChanServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_SIPSTATE_IDLE,"sipphone connect server failed at channel connect, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_SIPSTATE_IDLE,"sipphone connect server failed at channel connect, main server");
 		}else if (m_nCurChanServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_SIPSTATE_IDLE,"sipphone connect server failed at channel connect, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_SIPSTATE_IDLE,"sipphone connect server failed at channel connect, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_SIPSTATE_IDLE,"sipphone connect server failed at channel connect, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_SIPSTATE_IDLE,"sipphone connect server failed at channel connect, error server");
 		}
 		m_nCurSipServer?(m_nCurSipServer=Error_Server):(m_nCurSipServer=BACK_SERVER);
 		StopChannel();
@@ -887,11 +887,11 @@ unsigned int ACMCallFSM::s12_on_event(FSMEvent* event)
 		if (!m_bHangup)
 		{
 			if (m_nCurChanServer == MAIN_SERVER){
-				LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_CHANSTATE_IDLE,"chan connect server failed, main server");
+				LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_CHANSTATE_IDLE,"chan connect server failed, main server");
 			}else if (m_nCurChanServer == BACK_SERVER){
-				LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_CHANSTATE_IDLE,"chan connect server failed, bak server");
+				LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_CHANSTATE_IDLE,"chan connect server failed, bak server");
 			}else{
-				LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_CHANSTATE_IDLE,"chan connect server failed, error server");
+				LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_CHANSTATE_IDLE,"chan connect server failed, error server");
 			}
 			m_nCurChanServer?(m_nCurChanServer=Error_Server):(m_nCurChanServer=BACK_SERVER);
 		}
@@ -906,22 +906,22 @@ unsigned int ACMCallFSM::s12_on_event(FSMEvent* event)
 	else if (event->iEvt == USER_EVT_ASSISTCHAN_IDEL)
 	{
 		if (m_nCurChanServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_CHANENTITY_RESTART,"chan mod idle, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_CHANENTITY_RESTART,"chan mod idle, main server");
 		}else if (m_nCurChanServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_CHANENTITY_RESTART,"chan mod idle, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_CHANENTITY_RESTART,"chan mod idle, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_CHANENTITY_RESTART,"chan mod idle, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_CHANENTITY_RESTART,"chan mod idle, error server");
 		}
 		ReConnectionAssistchan();
 	}
 	else if (event->iEvt == USER_EVT_SIPPHONE_IDEL)
 	{
 		if (m_nCurChanServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_SIPENTITY_RESTART,"sipphone mod idle, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_SIPENTITY_RESTART,"sipphone mod idle, main server");
 		}else if (m_nCurChanServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_SIPENTITY_RESTART,"sipphone mod idle, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_SIPENTITY_RESTART,"sipphone mod idle, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_SIPENTITY_RESTART,"sipphone mod idle, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_SIPENTITY_RESTART,"sipphone mod idle, error server");
 		}
 		ReConnectionSipphone();
 	}
@@ -935,11 +935,11 @@ unsigned int ACMCallFSM::s12_on_event(FSMEvent* event)
 	else if (event->iEvt == USER_EVT_JMP_FAIL) 
 	{
 		if (m_nCurChanServer == MAIN_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_FUNC_FAILED,"chan connect func failed, main server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_MAIN_CHANCONNECT_FUNC_FAILED,"chan connect func failed, main server");
 		}else if (m_nCurChanServer == BACK_SERVER){
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_FUNC_FAILED,"chan connect func failed, bak server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_BAK_CHANCONNECT_FUNC_FAILED,"chan connect func failed, bak server");
 		}else{
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_FUNC_FAILED,"chan connect func failed, error server");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_CHANCONNECT_FUNC_FAILED,"chan connect func failed, error server");
 		}
 	}
 	
@@ -1057,7 +1057,7 @@ unsigned int ACMCallFSM::s21_on_event(FSMEvent* event)
 			//重启mod_sipphone
 			//RealSipErrorCheck();
 			LogEvent(Severity_Middle, EVENT_MOD_RELEASESIP_TIMEOUT,"restart sipphone");
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"restart sipphone");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"restart sipphone");
 		}
 	}
 	return 0;
@@ -1117,7 +1117,7 @@ unsigned int ACMCallFSM::s23_on_event(FSMEvent* event)
 			m_nSipErrorNum = 0;
 			//RealSipErrorCheck();
 			LogEvent(Severity_Middle, EVENT_MOD_RELEASESIP_TIMEOUT,"restart sipphone ");
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"FAIL TIMES, restart sipphone ");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"FAIL TIMES, restart sipphone ");
 		}
 	}
 	return 0;
@@ -1272,7 +1272,7 @@ unsigned int ACMCallFSM::s52_on_event(FSMEvent* event)
 			//重启mod_sipphone
 			//RealSipErrorCheck();
 			LogEvent(Severity_Middle, EVENT_MOD_RELEASESIP_TIMEOUT,"restart sipphone ");
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"restart sipphone ");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"restart sipphone ");
 		}
 
 	}
@@ -1303,7 +1303,7 @@ unsigned int ACMCallFSM::s53_on_event(FSMEvent* event)
 			m_nSipErrorNum = 0;
 			//RealSipErrorCheck();
 			LogEvent(Severity_Middle, EVENT_MOD_RELEASESIP_TIMEOUT,"restart sipphone ");
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"FAIL TIMES, restart sipphone ");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"FAIL TIMES, restart sipphone ");
 		}
 	}
 	return 0;
@@ -1384,7 +1384,7 @@ unsigned int ACMCallFSM::s62_on_event(FSMEvent* event)
 			//重启mod_sipphone
 			//RealSipErrorCheck();
 			LogEvent(Severity_Middle, EVENT_MOD_RELEASESIP_TIMEOUT,"restart sipphone ");
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"restart sipphone ");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"restart sipphone ");
 		}
 	}
 	return 0;
@@ -1414,7 +1414,7 @@ unsigned int ACMCallFSM::s63_on_event(FSMEvent* event)
 			m_nSipErrorNum = 0;
 			//RealSipErrorCheck();
 			LogEvent(Severity_Middle, EVENT_MOD_RELEASESIP_TIMEOUT,"restart sipphone ");
-			LogWarn(Severity_High, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"FAIL TIMES, restart sipphone ");
+			LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_RESTART_SIPPHONE,"FAIL TIMES, restart sipphone ");
 		}
 	}
 	return 0;

+ 5 - 5
Module/mod_counterconnector/mod_counterconnector.cpp

@@ -70,7 +70,7 @@ using namespace CounterConnector;
 	m_pCounterConnectorChannel = new ChannelCounterConnectorClient(this);
 	Error = m_pCounterConnectorChannel->Connect();
 	if (Error != Error_Succeed) {
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_CONNECT_ASSIST_ERROR, "connect assistant channel error");
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_CONNECT_ASSIST_ERROR, "connect assistant channel error");
 		m_pCounterConnectorChannel->SafeDelete();
 		return Error;
 	}
@@ -240,7 +240,7 @@ using namespace CounterConnector;
 				Dbg("界面拨号,免提呼叫");
 
 				if (pszMessage && strlen(pszMessage) > 0) {
-					LogWarn(Severity_Middle, Error_Unexpect, EVENT_MOD_CONNECT_SLV_PICKUPCALL_HAS_CMD, pszMessage);
+					LogWarn(Severity_Low, Error_Unexpect, EVENT_MOD_CONNECT_SLV_PICKUPCALL_HAS_CMD, pszMessage);
 				}
 
 				if (pszMessage && strlen(pszMessage) > 0 && isdigit(pszMessage[0])) 
@@ -728,11 +728,11 @@ void ChannelCounterConnectorClient::OnMessage(ErrorCodeEnum Error, ChannelServic
 			if (eChannelState_Connected == m_eLastState){
 				char strmsg[MAX_PATH] = {0};
 				snprintf(strmsg, MAX_PATH, "call connected time is %us.", y2k_time_now() - m_uConnectTime);
-				LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_CONNECT_TIME, strmsg);
+				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_CONNECT_TIME, strmsg);
 			}
 
 			if (eChannelState_Connecting == m_eLastState){
-				LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_ASSIST_CONNECT_FAILED,"make call failed for assistant channel connect failed!");
+				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_ASSIST_CONNECT_FAILED,"make call failed for assistant channel connect failed!");
 			}
 		} 
 		else if (Msg.state == eChannelState_Connected) 
@@ -748,7 +748,7 @@ void ChannelCounterConnectorClient::OnMessage(ErrorCodeEnum Error, ChannelServic
 		else if(eChannelState_Closing == Msg.state){
 			Dbg("ChannelState is eChannelState_Closing");
 			if (eChannelState_Connecting == m_eLastState){
-				LogWarn(Severity_Middle, Error_Debug, LOG_WARN_COUNTERCONNECT_ASSIST_CONNECT_FAILED,"make call failed for assistant channel closed.");
+				LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_ASSIST_CONNECT_FAILED,"make call failed for assistant channel closed.");
 			}
 		}
 

+ 9 - 9
Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -281,7 +281,7 @@ ErrorCodeEnum CITCtrlEntity::__OnStart(ErrorCodeEnum preOperationError)
 				int adOnSwitch(0);
 				spCacheConfig->ReadConfigValueInt("InteractiveControl", "AdvOnFlag", adOnSwitch);
 				if (adOnSwitch > 0) {
-					LogWarn(Severity_Middle, Error_Debug, LOG_EVT_OPEN_ADV_FROM_LOCAL_CONFIG,
+					LogWarn(Severity_Low, Error_Debug, LOG_EVT_OPEN_ADV_FROM_LOCAL_CONFIG,
 						CSimpleStringA::Format("support open adv from local config: %d", adOnSwitch));
 					m_bAdvOnFlag = true;
 				}
@@ -2165,22 +2165,22 @@ void UIServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<UIService_StartR
 		ctx->Ans.ErrorCode = 0;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("");
 		m_pEntity->m_bSalesRecording = TRUE;
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_REMOTERECORD_SUCCESS, "start remote record success!");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD_SUCCESS, "start remote record success!");
 	}
 	else if(camstate[0] == 'I') {
 		ctx->Ans.ErrorCode = 0x30B81001;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("录音录像设备正在启动,请稍后重试!");
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "录音录像设备正在启动,请稍后重试!");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "录音录像设备正在启动,请稍后重试!");
 	}
 	else if (camstate[0] == 'E'){
 		ctx->Ans.ErrorCode = Error_DevNotAvailable;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("摄像头故障,请联系分行技术部!");
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "env 摄像头故障,启动远程双录失败");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "env 摄像头故障,启动远程双录失败");
 	}
 	else {
 		ctx->Ans.ErrorCode = 0x30B81002;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("录音录像设备出现故障,请稍后重试!");
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "录音录像设备出现故障,请稍后重试!");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "录音录像设备出现故障,请稍后重试!");
 	}
 	
 	ctx->Answer(rc);
@@ -2194,10 +2194,10 @@ void UIServiceSession::Handle_StopRemoteRecord(SpReqAnsContext<UIService_StopRem
 	ErrorCodeEnum Error = m_pEntity->StopRecord(CSimpleStringW2A(ctx->Req.content));
 	ctx->Answer(Error);
 	if (Error_Succeed == Error){
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_STOP_REMOTERECORD_SUCCESS, "stop remote record success!");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_STOP_REMOTERECORD_SUCCESS, "stop remote record success!");
 	} 
 	else{
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_STOP_REMOTERECORD_FAILED, "stop remote record failed!");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_STOP_REMOTERECORD_FAILED, "stop remote record failed!");
 	}
 }
 
@@ -2513,7 +2513,7 @@ void UIServiceSession::Handle_StartPlayNotice(SpReqAnsContext<UIService_StartPla
 		ctx->Ans.ErrorCode = Error_DevConnFailed;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("StartPlayNotice, Connect PlayClient entity failed!");
 		Error = Error_DevConnFailed;
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StartPlayNotice call");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StartPlayNotice call");
 	}
 	else{
 		PlayService_StartPlayNotice_Req req;
@@ -2543,7 +2543,7 @@ void UIServiceSession::Handle_StopPlayNotice(SpReqAnsContext<UIService_StopPlayN
 		ctx->Ans.ErrorCode = Error_DevConnFailed;
 		ctx->Ans.ErrorMsg = CSimpleStringA2W("StopPlayNotice, Connect PlayClient entity failed!");
 		Error = Error_DevConnFailed;
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StopPlayNotice call");
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_LOCALMEDIAPLAYER_LOST, "StopPlayNotice call");
 	}
 	else{
 		PlayService_StopPlayNotice_Req req;

+ 6 - 5
Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -486,6 +486,7 @@ void CLocalMediaPlayEntity::MediaPlayFinished(int iMediaType)
 		Dbg("stop play video notice %s success.", ret.VideoNames.GetData());
 		SpSendBroadcast(GetFunction(), eMsg_VideoPlayRet, eMsgSig_VideoPlayRet, ret);
 	}
+
 }
 
 int CLocalMediaPlayEntity::GetMediaPlayerIcoPath(char* strPath, size_t uLen)
@@ -840,7 +841,7 @@ DWORD WINAPI MediaPlayThread(LPVOID param)
 				if (FALSE == bRet && false == entity->GetLocalLogFlag()){
 					char strmsg[MAX_PATH] = {0};
 					snprintf(strmsg, MAX_PATH, "adv video file %s not exist!", strVideoFullPath.GetData());
-					LogWarn(Severity_Middle, Error_Debug, LOG_EVT_ADV_VIDEO_NOT_EXIST, strmsg);
+					LogWarn(Severity_Low, Error_Debug, LOG_EVT_ADV_VIDEO_NOT_EXIST, strmsg);
 					entity->SetLocalLogFlag(true);
 				}
 				entity->m_pVideoPlayer[entity->m_mediaParam.nCfgInx]->PlayMedia(config);
@@ -880,7 +881,7 @@ DWORD WINAPI MediaPlayThread(LPVOID param)
 				if (FALSE == bRet && false == entity->GetLocalPicLogFlag()){
 					char strmsg[MAX_PATH] = {0};
 					snprintf(strmsg, MAX_PATH, "adv picture file %s not exist!", strPicFullPath.GetData());
-					LogWarn(Severity_Middle, Error_Debug, LOG_EVT_ADV_PIC_NOT_EXIST, strmsg);
+					LogWarn(Severity_Low, Error_Debug, LOG_EVT_ADV_PIC_NOT_EXIST, strmsg);
 					entity->SetLocalPicLogFlag(true);
 				}
 				entity->m_pImagePlayer[entity->m_mediaParam.nCfgInx]->PlayMedia(config);
@@ -1429,7 +1430,7 @@ ErrorCodeEnum CLocalMediaPlayEntity::StartNotice(int nCfgInx, int nWndX, int nWn
 				Dbg("create notice play thread[%u] success.", m_uNoticePlayThreadId);
 				char strinfo[MAX_PATH] = { 0 };
 				snprintf(strinfo, MAX_PATH, "start play video notice %s", strNoticeFileName.GetData());
-				LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_NOTICE_PLAY, strinfo);
+				LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_NOTICE_PLAY, strinfo);
 			}
 			else {
 				Dbg("create notice play thread failed.");
@@ -1439,7 +1440,7 @@ ErrorCodeEnum CLocalMediaPlayEntity::StartNotice(int nCfgInx, int nWndX, int nWn
 			Error = Error_InvalidState;
 			char strmsg[MAX_PATH] = { 0 };
 			snprintf(strmsg, MAX_PATH, "play notice failed for %s not exist!", strNoticeFileName.GetData());
-			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_NOTICE_FILE_NOT_EXIST, strmsg);
+			LogWarn(Severity_Low, Error_Debug, LOG_EVT_NOTICE_FILE_NOT_EXIST, strmsg);
 		}
 	}
 	
@@ -1465,7 +1466,7 @@ ErrorCodeEnum CLocalMediaPlayEntity::StopNotice(int nCfgInx)
 				if (m_lastPlayVideo.length() > 0) {
 					char strmsg[MAX_PATH] = { 0 };
 					snprintf(strmsg, MAX_PATH, "%s%s", "success to stop play notice ", m_lastPlayVideo.c_str());
-					LogWarn(Severity_Middle, Error_Debug, LOG_EVT_STOP_NOTICE_PLAY, strmsg);
+					LogWarn(Severity_Low, Error_Debug, LOG_EVT_STOP_NOTICE_PLAY, strmsg);
 				}
 			}
 			m_uNoticePlayThreadId = 0;

+ 14 - 20
Module/mod_mediacontroller/capture.cpp

@@ -13,7 +13,6 @@
 #include <md5.h>
 #include "y2k_time.h"
 #include "../../Other/rvcmediacommon/rvc_media_common.h"
-
 #include "Event.h"
 #include "capture.h"
 
@@ -317,7 +316,7 @@ static int portaudio_capture_start(audio_capture_t* audio_cap)
 	if (nId == -1)
 	{
 		//需要立即处理的告警使用Severity_High
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
 		return Error_AudioIN;
 	}
 
@@ -359,7 +358,7 @@ static int portaudio_capture_start(audio_capture_t* audio_cap)
 	if (nId == -1)
 	{
 		//需要立即处理的告警使用Severity_High
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEOUT_INITFAIL, "hand free out device config error,please check");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEOUT_INITFAIL, "hand free out device config error,please check");
 		return Error_AudioOut;
 	}
 	int out_dev_id = translate_id(FALSE, nId);
@@ -433,7 +432,7 @@ static int record_portaudio_capture_start(rvc_audio_capture_t* audio_cap)
 	if (nId == -1)
 	{
 		//需要立即处理的告警使用Severity_High
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
 		return Error_AudioIN;
 	}
 
@@ -561,7 +560,7 @@ static int pulseaudio_capture_start(audio_capture_t* audio_cap)
 		if (nId == -1)
 		{
 			//需要立即处理的告警使用Severity_High
-			LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
+			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
 			return Error_AudioIN;
 		}
 
@@ -651,13 +650,12 @@ static int record_pulseaudio_capture_start(rvc_audio_capture_t* audio_cap)
 	rvc_sales_audio_capture_t* cap = audio_cap->parent;
 
 	if (NULL != audio_cap->paudiocap) {
-		Dbg("%s:%d.", __FUNCTION__, __LINE__);
 		audiocap_param_t param = { 0 };
 		int nId = audio_cap->paudiocap->audio_get_device_id(cap->rvc_audio_config.strAudioIn.GetData(), true);
 		if (nId == -1)
 		{
 			//需要立即处理的告警使用Severity_High
-			LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
+			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_HANDFREEIN_INITFAIL, "hand free in device config error,please check");
 			return Error_AudioIN;
 		}
 
@@ -668,12 +666,8 @@ static int record_pulseaudio_capture_start(rvc_audio_capture_t* audio_cap)
 		param.flatency = 0.02;
 		param.on_audio_callback = &record_audio_data_callback;
 		param.user_data = audio_cap;
-
-		Dbg("%s:%d.", __FUNCTION__, __LINE__);
 		audio_cap->paudiocap->set_audio_capture_params(&param);
-		Dbg("%s:%d.", __FUNCTION__, __LINE__);
 		iret = audio_cap->paudiocap->start_audio_capture();
-		Dbg("%s:%d.", __FUNCTION__, __LINE__);
 	}
 
 	return iret;
@@ -1329,10 +1323,10 @@ static void __videocaplog(void* user_data, const char* fmt, va_list arg)
 static void __logevent(int itype, const char* strmessage)
 {
 	if (0 == itype) {
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_MEDIACONTROLLER_CAMERA_MATCHED_FORMAT, strmessage);
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_CAMERA_MATCHED_FORMAT, strmessage);
 	}
 	else if (1 == itype) {
-		LogWarn(Severity_Middle, Error_Debug, LOG_EVT_MEDIACONTROLLER_CAMERA_OUTPUT_FORMAT, strmessage);
+		LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_CAMERA_OUTPUT_FORMAT, strmessage);
 	}
 	else {
 		Dbg("unknown type event.");
@@ -1604,11 +1598,11 @@ namespace MediaController {
 				rslt = (ErrorCodeEnum)rc;
 				if (rslt == Error_AudioIN){
 					Dbg("start audio In object failed! rc:%d", rc);
-					LogWarn(Severity_Middle, Error_Debug,ERROR_MOD_MEDIACONTROLLER_HANDFREE_OPENFAIL,"open audioIn device fail,please check device");
+					LogWarn(Severity_Low, Error_Debug,ERROR_MOD_MEDIACONTROLLER_HANDFREE_OPENFAIL,"open audioIn device fail,please check device");
 				} 
 				else{
 					Dbg("start audio Out object failed! rc:%d", rc);
-					LogWarn(Severity_Middle, Error_Debug,ERROR_MOD_MEDIACONTROLLER_HANDFREE_OPENFAIL,"open audioOut device fail,please check device");
+					LogWarn(Severity_Low, Error_Debug,ERROR_MOD_MEDIACONTROLLER_HANDFREE_OPENFAIL,"open audioOut device fail,please check device");
 				}
 			}
 			else{
@@ -1640,7 +1634,7 @@ namespace MediaController {
 				Dbg("start env video capture object failed! rc:%d", rc);
 				char strMessage[MAX_PATH*2] = {0};
 				get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoEnv, "open environ camera fail,please check device.");
-				LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_ENVCAM_OPEN,strMessage);
+				LogWarn(Severity_Low,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_ENVCAM_OPEN,strMessage);
 				if (cap->opt_video) 
 				{
 					if (cap->env_video) 
@@ -1653,7 +1647,7 @@ namespace MediaController {
 						Dbg("start opt video capture object failed! rc:%d", rc);
 						char strMessage[MAX_PATH*2] = {0};
 						get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoOpt, "open operate camera fail,please check device.");
-						LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN, strMessage);
+						LogWarn(Severity_Low,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN, strMessage);
 						return Error_AllCamera;
 					}
 					else
@@ -1682,7 +1676,7 @@ namespace MediaController {
 						Dbg("start opt video capture object failed! rc:%d", rc);
 						char strMessage[MAX_PATH*2] = {0};
 						get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoOpt, "open operate camera fail,please check device.");
-						LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
+						LogWarn(Severity_Low,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
 						return Error_OptCamera;
 					}
 					else
@@ -1711,7 +1705,7 @@ namespace MediaController {
 					Dbg("start opt video capture object failed! rc:%d", rc);
 					char strMessage[MAX_PATH*2] = {0};
 					get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoOpt, "open operate camera fail,please check device.");
-					LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
+					LogWarn(Severity_Low,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
 					return Error_AllCamera;
 				}
 				else
@@ -1784,7 +1778,7 @@ namespace MediaController {
 			if (rslt != Error_Succeed) {
 				if (Error_AudioIN == rslt){
 					Dbg("start audio In object failed! rc:%d", rc);
-					LogWarn(Severity_Middle, Error_Debug,ERROR_MOD_MEDIACONTROLLER_HANDFREE_OPENFAIL,"open audioIn device fail,please check device");
+					LogWarn(Severity_Low, Error_Debug,ERROR_MOD_MEDIACONTROLLER_HANDFREE_OPENFAIL,"open audioIn device fail,please check device");
 				} 
 				rc = (ErrorCodeEnum)rslt;
 			}

+ 8 - 8
Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -608,7 +608,7 @@ public:
 			table.AddEntryBoolean("SalesRecorder", "IsRecordPCM", m_bRecordPCM, false);
 			Error= table.Load(spConfig);
 		}
-
+	
 		if (m_nSalesAudioSmpPsec != 8 && m_nSalesAudioSmpPsec != 16)
 		{
 			m_nSalesAudioSmpPsec = 8;
@@ -639,7 +639,7 @@ public:
 
 		CSimpleStringA val = newVal;
 		if ('B' == val[0]) {
-			LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_CONFIG_ALLERROR, "all config cameras error.");
+			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_CONFIG_ALLERROR, "all config cameras error.");
 		}
 
 		if (eStand2sType == m_eDeviceType)
@@ -801,7 +801,7 @@ public:
 		{
 			char strMessage[MAX_PATH*2] = {0};
 			get_camera_exception_message(strMessage, MAX_PATH*2, conf.strVideoEnv, "Env camera bug detected!");
-			LogWarn(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_ENVCAMERA_BUG, strMessage);
+			LogWarn(Severity_Low, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_ENVCAMERA_BUG, strMessage);
 			if ((ePadtype == m_eDeviceType)||(eMobilePadType == m_eDeviceType)||(eDesk2SType == m_eDeviceType)||(eDesk1SType == m_eDeviceType)||(eDesk2SIntegratedType == m_eDeviceType))
 			{
 				// comment by ly@2019/03/19
@@ -897,7 +897,7 @@ public:
 		{
 			char strMessage[MAX_PATH*2] = {0};
 			get_camera_exception_message(strMessage, MAX_PATH*2, conf.strVideoOpt, "Opt camera bug detected!");
-			LogWarn(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG, strMessage);
+			LogWarn(Severity_Low, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG, strMessage);
 			if (m_nCameraErrorCode == Error_Succeed)
 			{
 				m_nCameraErrorCode = Error_OptCamera;
@@ -1331,20 +1331,20 @@ private:
 				Error = AutoGetVideoDeviceName(conf);
 				snprintf(strInfo, MAX_PATH * 2, "env = %s,opt = %s", conf->strVideoEnv.GetData(), conf->strVideoOpt.GetData());
 				if (Error_Succeed == Error){
-					LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_VIDEO_AUTO_MATHED_SUCCESS, strInfo);
+					LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_VIDEO_AUTO_MATHED_SUCCESS, strInfo);
 				}
 				else {
-					LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_VIDEO_AUTO_MATHED_FAILED, strInfo);
+					LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_VIDEO_AUTO_MATHED_FAILED, strInfo);
 				}
 				Error = CheckConfigCameraName(conf);
 				if (Error == Error_EnvCamera || Error == Error_AllCamera){
 					char strMessage[MAX_PATH*2] = {0};
 					get_camera_exception_message(strMessage, MAX_PATH*2, conf->strVideoEnv ,"ENV 摄像头打开失败,请检查设备或配置是否正确!");
-					LogWarn(Severity_Middle,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_ENVCAM_INITFAIL, strMessage);
+					LogWarn(Severity_Low,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_ENVCAM_INITFAIL, strMessage);
 				} else if (Error == Error_OptCamera){
 					char strMessage[MAX_PATH*2] = {0};
 					get_camera_exception_message(strMessage, MAX_PATH*2, conf->strVideoOpt, "OPT 摄像头打开失败,请检查设备或配置是否正确!");
-					LogWarn(Severity_Middle,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_OPTCAM_INITFAIL, strMessage);
+					LogWarn(Severity_Low,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_OPTCAM_INITFAIL, strMessage);
 				}
 			}
 			else 

+ 18 - 18
Module/mod_sipphone/audio_session.cpp

@@ -203,7 +203,7 @@ static void recv_hook_callback(const char *buf, int size, void *arg)
 	if (false == psession->baudiorecved){
 		char strmsg[MAX_PATH] = { 0 };
 		snprintf(strmsg, MAX_PATH, "received first audio packet, and packet size is %d.", size);
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_AUDIO_STREAM_RECEIVED, strmsg);
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_STREAM_RECEIVED, strmsg);
 		psession->baudiorecved = true;
 	}
 
@@ -345,7 +345,7 @@ static void audio_device_event(bool bopen, int iret, bool bmicro, int idev, cons
 		}
 	}
 
-	LogWarn(Severity_Middle, Error_Debug, errorcode, strinfo);
+	LogWarn(Severity_Low, Error_Debug, errorcode, strinfo);
 }
 
 //static int translate_id(int in_direction, int idx);
@@ -523,19 +523,19 @@ static int phonemedia_start(audio_session_t *session)
 
 	status = apr_pool_create(&media->pool, NULL);
 	if (status != APR_SUCCESS) {
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_APR_POOL_CREATE_FAILED, "create media pool failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_APR_POOL_CREATE_FAILED, "create media pool failed!");
 		return Error_Resource;
 	}
 
 	status = audioengine_create(media->pool, &media->engine);
 	if (status != APR_SUCCESS) {
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_ENGINE_CREATE_FAILED, "create audio engine failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_ENGINE_CREATE_FAILED, "create audio engine failed!");
 		goto on_error;
 	}
 
 	status = audioengine_start(media->engine);
 	if (status != APR_SUCCESS) {
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_ENGINE_START_FAILED, "audio engine  start failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_ENGINE_START_FAILED, "audio engine  start failed!");
 		goto on_error;
 	}
 	Dbg("audioengine_start success!");
@@ -544,33 +544,33 @@ static int phonemedia_start(audio_session_t *session)
 	if (rc != 0) {
 		char strmsg[MAX_PATH] = { 0 };
 		snprintf(strmsg, MAX_PATH, "audio rtp session create2 failed and local port is %d, rc=%d", conf->local_rtp_port, rc);
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_RTP_SESSION_CREATE_FAILED, strmsg);
-		LogWarn(Severity_Middle, Error_InvalidState, EVENT_MOD_SIP_AUDIO_RTP_CREATE, strmsg);
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_RTP_SESSION_CREATE_FAILED, strmsg);
+		LogWarn(Severity_Low, Error_InvalidState, EVENT_MOD_SIP_AUDIO_RTP_CREATE, strmsg);
 		goto on_error;
 	}
 	else{
 		char strMessage[MAX_PATH] = { 0 };
 		snprintf(strMessage, MAX_PATH, "audio rtp create2 success and local port is %d.", conf->local_rtp_port);
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_AUDIO_RTP_CREATE, strMessage);
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_RTP_CREATE, strMessage);
 	}
 
 	rc = rtp_session_reset2(media->rtpsess, conf->dir, conf->remote_rtp_ip, conf->remote_rtp_port, conf->remote_rtp_port + 1);
 	if (rc != 0) {
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_RTP_SESSION_RESET_FAILED, "audio rtp session reset failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_RTP_SESSION_RESET_FAILED, "audio rtp session reset failed!");
 		goto on_error;
 	}
 	Dbg("rtp_session_reset2 success!");
 	
 	status = audiobridge_create(media->pool, media->engine, &media->bridge);
 	if (status != APR_SUCCESS){
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_BRIDGE_CREATE_FAILED, "audio bridge create failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_BRIDGE_CREATE_FAILED, "audio bridge create failed!");
 		goto on_error;
 	}
 	Dbg("audiobridge_create success!");
 
 	status = apr_pool_create(&media->micspk_pool, media->pool);
 	if (status != APR_SUCCESS){
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_APR_POOL_CREATE_FAILED, "create media micspk_pool failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_APR_POOL_CREATE_FAILED, "create media micspk_pool failed!");
 		goto on_error;
 	}
 	Dbg("apr_pool_create success!");
@@ -610,7 +610,7 @@ static int phonemedia_start(audio_session_t *session)
 		
 		status = audiodsp_create(media->micspk_pool, media->engine, read_opt, write_opt, AUDIO_CLOCK, &media->dspstream);
 		if (status != APR_SUCCESS){
-			LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_DSP_CREATE_FAILED, "create audio dsp failed!");
+			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_DSP_CREATE_FAILED, "create audio dsp failed!");
 			goto on_error;
 		}
 		Dbg("audiodsp_create success!");
@@ -627,20 +627,20 @@ static int phonemedia_start(audio_session_t *session)
 		conf->remote_ptime*2*AUDIO_CLOCK/1000, FRAME_TIME*2*AUDIO_CLOCK/1000, 
 		conf->local_ptime*2*AUDIO_CLOCK/1000, &media->resizestream);
 	if (status != APR_SUCCESS){
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_RESIZE_CREATE_FAILED, "create audio resize failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_RESIZE_CREATE_FAILED, "create audio resize failed!");
 		goto on_error;
 	}
 
 	status = audiocodec_create(media->pool, media->engine, codec, AUDIO_CLOCK, FRAME_TIME, 
 		AUDIO_CODEC_OPT_ENCODE_WRITE, &media->codecstream);
 	if (status != APR_SUCCESS){
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_CODEC_CREATE_FAILED, "create audio codec failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_CODEC_CREATE_FAILED, "create audio codec failed!");
 		goto on_error;
 	}
 
 	status = audiortp_create(media->pool, media->engine, media->rtpsess, &media->rtpstream);
 	if (status != APR_SUCCESS){
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_RTP_CREATE_FAILED, "create audio rtp failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_RTP_CREATE_FAILED, "create audio rtp failed!");
 		goto on_error;
 	}
 	Dbg("audio_session_t session addr is 0x%08x, audiortp_create success,and media->rtpstream addrs is 0x%08x!",session, media->rtpstream);
@@ -719,7 +719,7 @@ static int phonemedia_start(audio_session_t *session)
 
 	status = audiocontext_create(media->pool, media->engine, &media->context);
 	if (status != APR_SUCCESS){
-		LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_CONTEXT_CREATE_FAILED, "create audio context failed!");
+		LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_CONTEXT_CREATE_FAILED, "create audio context failed!");
 		goto on_error;
 	}
 	Dbg("audiocontext_create success!");
@@ -772,7 +772,7 @@ static int phonemedia_stop(audio_session_t *session, int b_record_turn_off)
 		{
 			char strInfo[MAX_PATH] = { 0 };
 			snprintf(strInfo, MAX_PATH, "audio rtp(media->rtpsess) destroy and local port is %u.", ilocal_port);
-			LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_AUDIO_RTP_DESTROY, strInfo);
+			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_RTP_DESTROY, strInfo);
 		}
 		media->rtpsess = NULL;
 	}
@@ -813,7 +813,7 @@ static int phonemedia_stop(audio_session_t *session, int b_record_turn_off)
 			{
 				char strInfo[MAX_PATH] = { 0 };
 				snprintf(strInfo, MAX_PATH, "audio rtp(record.rtpsess) destroy and local port is %u.", ilocal_port);
-				LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_AUDIO_RTP_DESTROY, strInfo);
+				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_RTP_DESTROY, strInfo);
 			}
 			media->record.rtpsess = NULL;
 		}

+ 12 - 12
Module/mod_sipphone/endpoint.cpp

@@ -193,7 +193,7 @@ static void endpoint_media_change_audio_dev(endpoint_call_t *call, e_dev_type cu
 		Dbg("begin audio_session_change_dev %d", current_dev_type);
 		char strmsg[MAX_PATH] = { 0 };
 		snprintf(strmsg, MAX_PATH, "change audio device to %s mode.", DEV_PICKUP == current_dev_type ? "pickup" : "hand free");
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_AUDIO_DEVICE_SWITCH, strmsg);
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_DEVICE_SWITCH, strmsg);
 		audio_session_change_dev(call->audio, current_dev_type);
 		Dbg("end audio_session_change_dev");
 	}
@@ -400,7 +400,7 @@ static void endpoint_media_update_audio(endpoint_call_t *call, media_desc_t *aud
 		{
 			char strmsg[MAX_PATH] = {0};
 			snprintf(strmsg, MAX_PATH, "start audio session failed! rc = %d.", rc);
-			LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_AUDIO_INITFAIL, strmsg);
+			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_AUDIO_INITFAIL, strmsg);
 			audio_session_destroy(call->audio);
 			call->audio = NULL;
 			return;
@@ -795,7 +795,7 @@ static void negotiate_sdp(endpoint_call_t *call, const sdp_session_t *local_sdp,
 			call->last_media_desc_hash = hash_code;
 			char strmsg[MAX_PATH] = {0};
 			snprintf(strmsg, MAX_PATH, "negotiate audio success!local audio ip=%s port=%d pt=%d,remote audio ip=%s port=%d,pt=%d",str_local,audio_desc.local_port,audio_desc.local_pt,str_remote,audio_desc.remote_port,audio_desc.remote_pt);
-			LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_CALL_AUDIO_NEGOTIATE, strmsg);
+			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CALL_AUDIO_NEGOTIATE, strmsg);
 		}
 	}
 
@@ -818,7 +818,7 @@ static void negotiate_sdp(endpoint_call_t *call, const sdp_session_t *local_sdp,
 			call->last_media_desc_hash = hash_code;
 			char strmsg[MAX_PATH] = {0};
 			snprintf(strmsg, MAX_PATH, "negotiate video success!local video ip=%s port=%d pt=%d,remote video ip=%s port=%d pt=%d",str_local,video_desc.local_port,video_desc.local_pt,str_remote,video_desc.remote_port,video_desc.remote_pt);
-			LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_CALL_VIDEO_NEGOTIATE, strmsg);
+			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CALL_VIDEO_NEGOTIATE, strmsg);
 		}
 	}
 	else
@@ -864,7 +864,7 @@ static void on_state(CONDITION_PARAMS)
 
 	char strmsg[MAX_PATH] = { 0 };
 	snprintf(strmsg, MAX_PATH, "state = %d, offer_recv=%d, answer_recv=%d, offer_sent=%d, answer_sent=%d", state, offer_recv, answer_recv, offer_sent, answer_sent);
-	LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strmsg);
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strmsg);
 
 	switch (state)
 	{
@@ -872,7 +872,7 @@ static void on_state(CONDITION_PARAMS)
 			{
 				char strcalling[MAX_PATH] = { 0 };
 				snprintf(strcalling, MAX_PATH, "nua_callstate_calling, has_local_sdp : %d, has_remote_sdp : %d", !!local_sdp_str, !!remote_sdp_str);
-				LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strcalling);
+				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strcalling);
 				if (local_sdp_str) {
 					sdp_parser_t* parser = sdp_parse(call->home, local_sdp_str, strlen(local_sdp_str), -1);
 					assert(call->last_sdp == NULL);
@@ -888,7 +888,7 @@ static void on_state(CONDITION_PARAMS)
 			{
 				char strproceeding[MAX_PATH] = { 0 };
 				snprintf(strproceeding, MAX_PATH, "nua_callstate_proceeding, status = %d, has_local_sdp: %d, has_remote_sdp : %d", status, !!local_sdp_str, !!remote_sdp_str);
-				LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strproceeding);
+				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strproceeding);
 				st = PROCEEDING;
 				call->cb.on_call_state(st, state_desc[st], phrase, call->cb.user_data);
 				if (remote_sdp_str) {
@@ -909,7 +909,7 @@ static void on_state(CONDITION_PARAMS)
 				st = COMPLETING;
 				char strcompleting[MAX_PATH] = { 0 };
 				snprintf(strcompleting, MAX_PATH, "nua_callstate_completing, has_local_sdp : %d, has_remote_sdp : %d", !!local_sdp_str, !!remote_sdp_str);
-				LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strcompleting);
+				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strcompleting);
 				call->cb.on_call_state(st, state_desc[st], phrase, call->cb.user_data);
 				if (remote_sdp_str) {
 					sdp_parser_t* parser = sdp_parse(call->home, remote_sdp_str, strlen(remote_sdp_str), -1);
@@ -928,7 +928,7 @@ static void on_state(CONDITION_PARAMS)
 			{
 				char strcompleted[MAX_PATH] = { 0 };
 				snprintf(strcompleted, MAX_PATH, "nua_callstate_completed, has_local_sdp : %d, has_remote_sdp : %d", !!local_sdp_str, !!remote_sdp_str);
-				LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strcompleted);
+				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strcompleted);
 				if (remote_sdp_str) {
 					if (!call->last_sdp) {
 						sdp_parser_t* parser = sdp_parse(call->home, remote_sdp_str, strlen(remote_sdp_str), -1);
@@ -954,7 +954,7 @@ static void on_state(CONDITION_PARAMS)
 				call->connected = true;
 				char strready[MAX_PATH] = { 0 };
 				snprintf(strready, MAX_PATH, "nua_callstate_ready, has_local_sdp : %d, has_remote_sdp : %d.", !!local_sdp_str, !!remote_sdp_str);
-				LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strready);
+				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strready);
 				st = READY;
 				call->cb.on_call_state(st, state_desc[st], phrase, call->cb.user_data);
 				if (remote_sdp_str) {
@@ -989,7 +989,7 @@ static void on_state(CONDITION_PARAMS)
 				st = TERMINATED;
 				char strterminated[MAX_PATH] = { 0 };
 				snprintf(strterminated, MAX_PATH, "call terminated! in sofia thread!");
-				LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strterminated);
+				LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_PROCESS_MSG, strterminated);
 				{
 					media_desc_t audio_desc = { 0 };
 					audio_desc.media_dir = DIR_NONE;
@@ -1454,7 +1454,7 @@ int endpoint_call_start(endpoint_call_t *call)
 		//SOATAG_AUDIO_AUX("telephone-event"), 
 		TAG_END());
 
-	LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_INVITE_SEND, sdp);
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_INVITE_SEND, sdp);
 
 	return 0;
 }

+ 11 - 11
Module/mod_sipphone/mod_sipphone.cpp

@@ -573,7 +573,7 @@ void CSIPEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITr
 
 void CSIPEntity::OnStarted() 
 { 
-    LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_ENTITY_STARTED, "sipphone entity started.");
+    LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_ENTITY_STARTED, "sipphone entity started.");
 
 	ErrorCodeEnum Error = Error_Succeed;
 	m_pSelfcheckClient = new SelfChekerClient(this);
@@ -701,7 +701,7 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 	{
 		LOG_TRACE("get local ip failed!");
 		CSimpleStringA strErrMsg = "获取本地 IP 地址失败,请检查本地网络是否连接!";
-		LogWarn(Severity_Middle, Error_NetBroken, 0, strErrMsg);
+		LogWarn(Severity_Low, Error_NetBroken, 0, strErrMsg);
 		return Error;
 	}
 
@@ -1879,7 +1879,7 @@ void CSIPEntity::InitFreshTimeConfig()
 		}
 	}
 
-	LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_OVERWRITE_FRESHVALUE,
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_OVERWRITE_FRESHVALUE,
 			CSimpleStringA::Format("overwrite video freshtime from centersetting cache, left fresh time is %d, right fresh time is %d.", ileftvideo, irightvideo));
     m_ilocalvideo_freshtime = ileftvideo;
 	m_iremotevideo_freshtime = irightvideo;
@@ -1928,7 +1928,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				Dbg("audio handfree in device %s does not exist!", (LPCSTR)strHandFreeIn);
 				CSimpleStringA strErrMsg = "外部麦克风配置错误,请重新配置!";
-				LogWarn(Severity_Middle, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_handfree_in_dev, strHandFreeIn);
@@ -1940,7 +1940,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				Dbg("audio handfree out device %s does not exist!", (LPCSTR)strHandFreeOut);
 				CSimpleStringA strErrMsg = "外部扬声器配置错误,请重新配置!";
-				LogWarn(Severity_Middle, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_handfree_out_dev, strHandFreeOut);
@@ -1953,7 +1953,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				Dbg("audio pickup in device %s does not exist!", (LPCSTR)strPickupIn);
 				CSimpleStringA strErrMsg = "话筒麦克风(大机)配置错误,请重新配置!";
-				LogWarn(Severity_Middle, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_pickup_in_dev, strPickupIn);
@@ -1965,7 +1965,7 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			if (id == -1) {
 				Dbg("audio device %s does not exist!", (LPCSTR)strPickupOut);
 				CSimpleStringA strErrMsg = "话筒扬声器(大机)配置错误,请重新配置!";
-				LogWarn(Severity_Middle, Error_Param, 0, strErrMsg);
+				LogWarn(Severity_Low, Error_Param, 0, strErrMsg);
 				Error = Error_Param;
 			}
 			strcpy(conf->audio_pickup_out_dev, strPickupOut);
@@ -2184,7 +2184,7 @@ void CSIPPhoneSession::Handle_MakeCall( SpReqAnsContext<PhoneService_MakeCall_Re
 
 	char strmsg[MAX_PATH] = {0};
 	snprintf(strmsg, MAX_PATH, "make call [%s]", (LPCSTR)ctx->Req.to_uri);
-	LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_CALL_URL, strmsg);
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CALL_URL, strmsg);
 
 	int rc;
 	MakeCallCommand_t *cmd = new MakeCallCommand_t();
@@ -2466,7 +2466,7 @@ void CSIPPhoneSession::on_call_state(int state, const char *state_desc, const ch
 	{
 		char strmsg[MAX_PATH] = {0};
 		snprintf(strmsg, MAX_PATH, "on_call_state message state = %d, status=%s, phrase=%s!", state, state_desc, phrase);
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_CALL_STATE_INFO, strmsg);
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CALL_STATE_INFO, strmsg);
 		PhoneService_PhoneState_Info Info;
 		Info.state = state;
 		Info.status = CSimpleStringA::Format("%s,%s", state_desc, phrase);
@@ -2645,10 +2645,10 @@ int CSIPPhoneSession::start_video_render(rvc_video_render_params_t* render_param
 	t_callback.debug = &__video_render_log;
 
 	m_pEntity->m_render->plocal_render = CreateVideoRenderObj(&t_callback);
-	LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_CREATE, "local video render create.");
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_CREATE, "local video render create.");
 
 	m_pEntity->m_render->premote_render = CreateVideoRenderObj(&t_callback);
-	LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_CREATE, "remote video render create.");
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_CREATE, "remote video render create.");
 
 	memcpy(&m_pEntity->m_render->location_param, render_param, sizeof(rvc_video_render_params_t));
 	m_pEntity->m_render->ui_threadid = 0;

+ 9 - 10
Module/mod_sipphone/video_session.cpp

@@ -114,10 +114,10 @@ static void __dbg(void *user_data, const char *fmt, va_list arg)
 static void __logevent(void* user_data, int itype, const char* strmessage)
 {
 	if (0 == itype) {
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_CREATE, strmessage);
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_CREATE, strmessage);
 	}
 	else {
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_DESTROY, strmessage);
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_DESTROY, strmessage);
 	}
 }
 
@@ -126,10 +126,10 @@ static bool __camera_error_event(bool bhaspost, int icameraid)
 	bool bret = false;
 	if (false == bhaspost){
 		if (0 == icameraid){
-			LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_GET_ENV_VIDEO_FAILED, "get video from env queue failed!");
+			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_GET_ENV_VIDEO_FAILED, "get video from env queue failed!");
 		}
 		else{
-			LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_SIP_GET_OPT_VIDEO_FAILED, "get video from opt queue failed!");
+			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_SIP_GET_OPT_VIDEO_FAILED, "get video from opt queue failed!");
 		}		
 		bret = true;
 	}
@@ -427,7 +427,7 @@ static int on_rx_frame(video_frame *frame, void *user_data)
 		used = 1;
 
 		if (false == session->bremoterender) {
-			LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_STARTED, "start remote video render.");
+			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_STARTED, "start remote video render.");
 			session->bremoterender = true;
 		}
 
@@ -442,7 +442,7 @@ static void on_rx_udp(const char* buf, int size, void* user_data)
 	if (false == session->bvideorecved) {
 		char strmsg[MAX_PATH] = { 0 };
 		snprintf(strmsg, MAX_PATH, "received first video packet, and packet size is %d.", size);
-		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_VIDEO_STREAM_RECEIVED, strmsg);
+		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_VIDEO_STREAM_RECEIVED, strmsg);
 		session->bvideorecved = true;
 	}
 }
@@ -949,7 +949,6 @@ static int start_video_rtpsession(video_session_t* session)
 		Dbg("videortp create failed!");
 	}
 
-	//session->premote_render->StartVideoRender();
 	rc = videortp_start(session->rtp);
 	if (rc != 0)
 	{
@@ -1853,7 +1852,7 @@ static void __video_render_log(void* user_data, const char* fmt, va_list arg)
 //		tparam.uwidth = session->conf.local_video_view_cx;
 //		tparam.uheight = session->conf.local_video_view_cy;
 //		tparam.ivideoformat = VIDEO_FORMAT_RGB24;
-//		LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_CREATE, "local video render create.");
+//		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_CREATE, "local video render create.");
 //		if (0 == session->plocal_render->VideoRenderSetParam(&tparam)){
 //			session->plocal_render->HideVideoWindow();
 //		}
@@ -1876,7 +1875,7 @@ static void __video_render_log(void* user_data, const char* fmt, va_list arg)
 //			if (0 == session->premote_render->VideoRenderSetParam(&tparam_remote)) {
 //				//session->premote_render->ShowVideoWindow();
 //			}
-//			LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_CREATE, "remote video render create.");
+//			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_CREATE, "remote video render create.");
 //		}
 //		else {
 //			Dbg("session remote video render is null.");
@@ -1926,7 +1925,7 @@ static void __video_render_log(void* user_data, const char* fmt, va_list arg)
 //					}
 //
 //					if (false == session->blocalrender){
-//						LogWarn(Severity_Middle, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_STARTED, "start local video render.");
+//						LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_STARTED, "start local video render.");
 //						session->blocalrender = true;
 //					}
 //