Z991239-6287 #comment 事件转换实体日志优化

Module/mod_evtconverter/mod_evtconverter.cpp

@@ -31,21 +31,11 @@ public:
 	}
 	ErrorCodeEnum __OnStart(ErrorCodeEnum preOperationError)
 	{
-
-		if (m_nIslog){
-
-		}
 		m_eDeviceType = eStand2sType; 
 		m_nIslog = 1;
 		ErrorCodeEnum Error;
 		CSimpleStringA str;
 		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
-		CSimpleStringA strConfigDir;
-		Error = spEntityFunction->GetPath("CFG", strConfigDir);
-		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get etc directory failed!");
-            return Error;
-        }
 
 		m_eDeviceType = RvcGetDeviceType();
 	
@@ -61,12 +51,12 @@ public:
 		CSmartPointer<IConfigInfo> spConfigCenterSetting;
 		Error = spEntityFunction->OpenConfig(Config_CenterSetting, spConfigCenterSetting);
         if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("open config failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("open config failed!");
             return Error;
         }
 		Error = spConfigCenterSetting->ReadConfigValue(GetEntityName(), "IsLog", str);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load config failed, read Log.IsLog failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("load config failed, read Log.IsLog failed!");
 			return Error;
 		}
 		m_nIslog = atoi(str);
@@ -87,21 +77,21 @@ public:
 		cb.user_data = this;
 		int rc = evt_engine_create(&cb, &engine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("create engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("create engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 
 		if (num > 0) {
 			rc = evt_engine_load(engine, indexarr, num, slot_trigger_arr, sizeof(slot_trigger_arr)/sizeof(slot_trigger_elem_t));
 			if (rc != 0) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load config failed!");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("load config failed!");
 				return (ErrorCodeEnum)rc;
 			}
 		}
 
 		rc = evt_engine_start(engine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("start engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("start engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 
@@ -144,12 +134,12 @@ public:
 		int rc;
 		rc = evt_engine_stop(m_pEngine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("stop engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("stop engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 		rc = evt_engine_unload(m_pEngine);
 		if (rc != 0) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unload engine failed!");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("unload engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
 		evt_engine_destroy(m_pEngine);
@@ -163,7 +153,7 @@ public:
 		if (m_pEngine) {
 			int rc = evt_engine_process_sysvar(m_pEngine, pszKey, pszValue, pszOldValue, pszEntityName);
 			if (rc != 0) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("process sysvar failed! Error; %d, key=%s oldvalue=%s, value=%s", rc,pszKey, pszOldValue, pszValue);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA1301")("process sysvar failed! Error; %d, key=%s oldvalue=%s, value=%s", rc,pszKey, pszOldValue, pszValue);
 			}
 		}
 	}
@@ -175,7 +165,7 @@ public:
 		if (m_pEngine) {
 			int rc = evt_engine_process_log(m_pEngine, SubIDs, nLogID, eLogType, eLevel, dwSysError, dwUserCode, wEntityDevelID, pszEntityName, pszModuleName, pszMessage);
 			if (rc != 0) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("process log failed! Error: %d", rc);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process log failed! Error: %d", rc);
 			}
 		}
 	}
@@ -203,7 +193,7 @@ private:
 		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
 		ErrorCodeEnum Error = spEntityFunction->SetTimer((DWORD)timer_id, pWarp, (DWORD)interval);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set timer %d failed!", timer_id);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("set timer %d failed!", timer_id);
 			delete pWarp;
 		} 
 		else {
@@ -226,7 +216,7 @@ private:
 		CUUID uuid;
 		ErrorCodeEnum Error = GetFunction()->SubscribeLog(uuid, this, eLogType, eSeverityLevel, eSysError, dwUserCode, szEntity, bIgnoreMessage);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe log failed! Error = %d", Error);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("subscribe log failed! Error = %d", Error);
 		} 
 		else {
 			*sub_id = (unsigned long long)uuid;
@@ -240,7 +230,7 @@ private:
 		if (Error == Error_Succeed) {
 		} 
 		else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unsubscribe log failed! Error = %d", Error);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("unsubscribe log failed! Error = %d", Error);
 		}
 		return (int)Error;
 	}
@@ -249,22 +239,22 @@ private:
 	{
 		ErrorCodeEnum Error = GetFunction()->RegistSysVarEvent("CustomerBeing", this);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerBeing");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerBeing");
 		}
 
 		Error = GetFunction()->RegistSysVarEvent("CustomerHandle", this);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerHandle");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CustomerHandle");
 		}
 
 		Error = GetFunction()->RegistSysVarEvent("CallState", this);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CallState");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "CallState");
 		}
 
 		Error = GetFunction()->RegistSysVarEvent("BackInitiative", this);
 		if (Error != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "BackInitiative");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("register sysvar %s failed!", "BackInitiative");
 		}
 
 		return Error;