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

Module/mod_evtconverter/evtengine.cpp

@@ -508,9 +508,6 @@ static void get_matched_slot_list(evt_engine_t *engine, const CAutoArray<CUUID>
 		filter = filter_find(engine->filter_ht, &k);
 		if (filter) {
 			evt_slot_t *slot = filter->owner;
-			if (nIslog){
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("filter found, usr_code:%d, listen_id:%d", usr_code, k.listen_id);
-			}
 			if (!slot->use_entry.next) {
 				list_add_tail(&slot->use_entry, use_list);
 				slot->use_list_ptr = use_list;
@@ -544,16 +541,14 @@ static void get_reset_slot_list(evt_engine_t *engine, struct list_head *matched_
 				} 
 				else {
 					if (t->use_list_ptr == matched_list) {					
-						if (nIslog){
-							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("warning: slot %s already set, cannot reset from slot %s ", t->key.code, pos->key.code);
-						}
+
 					} 
 					else if (t->use_list_ptr == reset_list) {
 						// already triggers by others
 					} 
 					else {						
 						if (nIslog){
-							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("bug detected! %s%d", __FUNCTION__, __LINE__);
+							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("bug detected!");
 						}
 					}
 				}
@@ -702,9 +697,6 @@ static int process_matched_slot_list(evt_engine_t *engine, struct list_head *slo
 static int process_reset_slot(evt_engine_t *engine, evt_slot_t *slot, int *removed)
 {
 	int rc = 0;
-	if (nIslog){
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process reset slot: %s, current signal:%d", slot->key.code, slot->signal_state);
-	}
 
 	if (slot->signal_state) {
 		slot->signal_state = !slot->signal_state;
@@ -774,7 +766,7 @@ static int generate_trigger_log(evt_engine_t *engine, evt_trigger_t *trigger)
 		break;
 	default:
 		if (nIslog){
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("bug detected! %s %d", __FUNCTION__, __LINE__);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("bug detected!");
 		}
 
 		assert(0);
@@ -789,17 +781,9 @@ static int process_trigger(evt_engine_t *engine, evt_trigger_t *trigger)
 	int rc = 0;
 	int ok = 0;
 
-	if (nIslog){
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process_trigger %s begin!", trigger->msg);
-	}
-
 	{
 		evt_slot_rule_t *pos;
 		list_for_each_entry(pos, &trigger->slot_rule_list, evt_slot_rule_t, entry) {
-			if (nIslog){
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("slot rule, code:%s positive:%d signal:%d", pos->code, pos->positive, pos->ref_slot->signal_state);
-			}
-
 			if (pos->positive ^ pos->ref_slot->signal_state)
 				goto on_done;
 		}
@@ -817,18 +801,9 @@ static int process_trigger(evt_engine_t *engine, evt_trigger_t *trigger)
 				goto on_done;
 			}
 
-			if (nIslog){
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sysvar key=%s, value=%s", pos->ref_sysvar->key.code, strState.GetData());
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sysvar rule, %s, positive:%d", pos->ref_sysvar->key.code, pos->positive);
-			}
-
 			if (pos->positive) {
 				for (i = 0; i < pos->arr_state->nelts; ++i) {
 					char *state = ARRAY_IDX(pos->arr_state, i, char*);
-					if (nIslog){
-						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sys var state:%s", state);
-					}	
-
 					if (strcmp(strState, state) == 0) {
 						break;
 					}
@@ -840,10 +815,6 @@ static int process_trigger(evt_engine_t *engine, evt_trigger_t *trigger)
 			else {
 				for (i = 0; i < pos->arr_state->nelts; ++i) {
 					char *state = ARRAY_IDX(pos->arr_state, i, char*);		
-					if (nIslog){
-						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sys var state:%s", state);
-					}
-
 					if (strcmp(strState, state) == 0) {
 						goto on_done;
 					}
@@ -880,9 +851,6 @@ on_done:
 		}
 	}
 
-	if (nIslog){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("process_trigger end (ok=%d)!", ok);
-	}
 	return rc;
 }
 
@@ -951,9 +919,6 @@ static int process_log(evt_engine_t *engine, const CAutoArray<CUUID> &SubIDs, in
 	get_matched_slot_list(engine, SubIDs,log_type, ent_id, severity, sys_code, usr_code, message,  &matched_list);
 
 	if (list_empty(&matched_list)) {
-		if (nIslog){
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("warning: no matched slot! sys_code = %d, usr_code = %d", sys_code, usr_code);
-		}
 		return 0;
 	}
 
@@ -1032,19 +997,13 @@ static int build_ref(evt_engine_t *engine)
 {
 	int i;
 	evt_trigger_t *trigger;
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("after load engine->slot_ht->size = %d.", engine->slot_ht->size);
 	for (i = 0; i < engine->slot_ht->size; ++i) {
 		evt_slot_t *tpos;
 		struct hlist_node *pos;
 		hlist_for_each_entry(tpos, pos, &engine->slot_ht->buckets[i], evt_slot_t, hentry) {
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(
-			//	"tpos->key.code = %s, tpos->key.index_hash_code = %d, tpos->signal_state = %d.",
-			//	tpos->key.code, tpos->key.index_hash_code, tpos->signal_state);
-
 			int j;
 			for (j = 0; j < tpos->arr_reset->nelts; ++j) {
 				char *code = ARRAY_IDX(tpos->arr_reset, j, char*);
-				//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("code = %s.", code);
 				evt_slot_key_t key;
 				key.code = code;
 				key.index_hash_code = hash32_str(code, HASH32_STR_INIT);
@@ -1052,7 +1011,6 @@ static int build_ref(evt_engine_t *engine)
 				if (ref_slot) {
 					ARRAY_PUSH(ref_slot->arr_rref_reset, evt_slot_t*) = tpos;
 					ARRAY_PUSH(tpos->arr_ref_reset, evt_slot_t*) = ref_slot;
-					//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("build reset ref for slot %s->%s", tpos->key.code, code);
 				} 
 				else {
 					if (nIslog){
@@ -1065,12 +1023,8 @@ static int build_ref(evt_engine_t *engine)
 	}
 
 	list_for_each_entry(trigger, &engine->trigger_list, evt_trigger_t, entry) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(
-		//	"trigger->log_type = %d, trigger->severity_level = %d, trigger->sys_code = %d, trigger->user_code = 0x%08x, trigger->delay_ms = %d, trigger->delay_timer_id = %d, trigger->msg = %s.",
-		//	trigger->log_type, trigger->severity_level, trigger->sys_code, trigger->user_code, trigger->delay_ms, trigger->delay_timer_id, trigger->msg);
 		evt_slot_rule_t *rule;
 		list_for_each_entry(rule, &trigger->slot_rule_list, evt_slot_rule_t, entry) {
-			//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("rule->positive = %d, rule->code = %s, rule->message = %s.",rule->positive, rule->code, rule->message);
 			evt_slot_key_t key;
 			key.code = rule->code;
 			key.index_hash_code = hash32_str(key.code, HASH32_STR_INIT);
@@ -1078,12 +1032,8 @@ static int build_ref(evt_engine_t *engine)
 			if (ref_slot) {
 				rule->ref_slot = ref_slot;
 				ARRAY_PUSH(ref_slot->arr_ref_trigger, evt_trigger_t*) = rule->parent;
-				//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("array push trigger.slot %s.", rule->code);
 			} 
 			else {
-				if (nIslog){
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("trigger.slot %s cannot find code!", rule->code);
-				}
 				return Error_Unexpect;
 			}
 		}
@@ -1486,7 +1436,6 @@ static int load_filter_element(evt_engine_t* engine, evt_slot_t* slot, rvc_slotf
 	if (rc != 0) {
 		return rc;
 	}
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("filter->log_type = %d, filter->ent_id = %d, entity = %s, filter->severity = %d, filter->sys_code = %d, filter->user_code = 0x%08x, slotvar = %s.", filter->log_type, filter->ent_id, entity, filter->severity, filter->sys_code, filter->user_code, slotvar);
 	
 	if (slotvar) {
 		int i;
@@ -1555,9 +1504,6 @@ static int load_slot_arrays(evt_engine_t* engine, const char* ns, rvc_slot_t* tn
 	char* code = NULL;
 
 	if (!tnode->strCode) {
-		if (nIslog) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("slot miss attribute code!");
-		}
 		slot_free(slot);
 		return Error_Unexpect;
 	}
@@ -1578,7 +1524,6 @@ static int load_slot_arrays(evt_engine_t* engine, const char* ns, rvc_slot_t* tn
 	}
 
 	if (tnode->strTimeout) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tnode->strTimeout == %s.", tnode->strTimeout);
 		evt_expire_t* expire = ZALLOC_T(evt_expire_t);
 		if (!expire) {
 			slot_free(slot);
@@ -1602,7 +1547,6 @@ static int load_slot_arrays(evt_engine_t* engine, const char* ns, rvc_slot_t* tn
 	}
 
 	if (tnode->strOneTrigger) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tnode->strOneTrigger == %s.", tnode->strOneTrigger);
 		slot->once = parse_bool(tnode->strOneTrigger);
 	}
 	else {
@@ -1616,9 +1560,6 @@ static int load_slot_arrays(evt_engine_t* engine, const char* ns, rvc_slot_t* tn
 			if (rc != 0) {
 				break;
 			}
-			//else {
-			//	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("slot var name is %s, value is %s.", tnode->Vars[ivar].strName, tnode->Vars[ivar].strValue);
-			//}
 		}
 	}
 
@@ -1647,7 +1588,6 @@ static int load_slot_arrays(evt_engine_t* engine, const char* ns, rvc_slot_t* tn
 				else {
 					ARRAY_PUSH(slot->arr_reset, char*) = source;
 				}
-				//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("slot var reset source is %s.", tnode->Reset[ireset].strSource);
 			}
 			else {
 				break;
@@ -1659,21 +1599,12 @@ static int load_slot_arrays(evt_engine_t* engine, const char* ns, rvc_slot_t* tn
 	}
 
 	if (slot_find(engine->slot_ht, &slot->key)) {
-		if (nIslog) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("duplicate slot %s", slot->key.code);
-		}
 		slot_free(slot);
 		return Error_Unexpect;
 	}
 
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("engine->slot_ht->size = %d, engine->slot_ht count = %d.", engine->slot_ht->size, htable_get_count(engine->slot_ht));
-
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("slot->key.code = %s, slot->key.index_hash_code = %d.", slot->key.code, slot->key.index_hash_code);
-
 	slot_add(engine->slot_ht, slot);
 
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("engine->slot_ht->size = %d, engine->slot_ht count = %d.", engine->slot_ht->size, htable_get_count(engine->slot_ht));
-
 	return 0;
 }
 
@@ -1683,16 +1614,13 @@ static int load_slot_element_rule(evt_trigger_t* trigger, const char* ns, rvc_tr
 	evt_slot_rule_t* rule = ZALLOC_T(evt_slot_rule_t);
 
 	if (slot_elem->strCode) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Slot Code value is %s.", slot_elem->strCode);
 		rule->code = parse_code(ns, slot_elem->strCode);
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("after parse_code, rule->code is %s.", rule->code);
 	}
 	else {
 		goto on_error;
 	}
 
 	if (slot_elem->strPositive) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Slot Positive value is %s.", slot_elem->strPositive);
 		rule->positive = parse_bool(slot_elem->strPositive);
 		if (rule->positive == -1) {
 			if (nIslog) {
@@ -1706,7 +1634,6 @@ static int load_slot_element_rule(evt_trigger_t* trigger, const char* ns, rvc_tr
 	}
 
 	if (slot_elem->strMessage) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Slot Message value is %s.", slot_elem->strMessage);
 		rule->message = _strdup(slot_elem->strMessage);
 	}
 	rule->parent = trigger;
@@ -1724,7 +1651,6 @@ static int load_sysvar_element_rule(evt_engine_t* engine, evt_trigger_t* trigger
 
 	if (sysvar_elem->strCode) {
 		char* code = sysvar_elem->strCode;
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("sysvar code is %s.", code);
 		evt_sysvar_key_t key;
 		key.code = code;
 		key.index_hash_code = hash32_str(code, HASH32_STR_INIT);
@@ -1747,7 +1673,6 @@ static int load_sysvar_element_rule(evt_engine_t* engine, evt_trigger_t* trigger
 	}
 
 	if (sysvar_elem->strPositive) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("sysvar Positive is %s.", sysvar_elem->strPositive);
 		rule->positive = parse_bool(sysvar_elem->strPositive);
 	}
 	else {
@@ -1761,20 +1686,14 @@ static int load_sysvar_element_rule(evt_engine_t* engine, evt_trigger_t* trigger
 		for (int istate = 0; istate < states_arr_length; istate++) {
 			const char* state = sysvar_elem->strstates[istate];
 			if (state) {
-				//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("add sysvar state %s.", state);
 				ARRAY_PUSH(rule->arr_state, char*) = _strdup(state);
 			}
 			else {
-				//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sysvar state is NULL, add it.");
-				//ARRAY_PUSH(rule->arr_state, char*) = NULL;
 				break;
 			}
 		}
 	}
 	else {
-		if (nIslog) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("trigger sysvar does not have state children!");
-		}
 		sysvar_rule_free(rule);
 		return Error_Unexpect;
 	}
@@ -1798,7 +1717,6 @@ static int load_trigger_arrays(evt_engine_t* engine, const char* ns, rvc_trigger
 	INIT_LIST_HEAD(&trigger->sysvar_list);
 
 	if (trigger_elem->strLogType) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("LogType value is %s.", trigger_elem->strLogType);
 		trigger->log_type = parse_log_type(trigger_elem->strLogType);
 		if (trigger->log_type == -1) {
 			if (nIslog) {
@@ -1873,7 +1791,6 @@ static int load_trigger_arrays(evt_engine_t* engine, const char* ns, rvc_trigger
 	}
 
 	if (trigger_elem->strMessage) {
-		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Message value is %s.", trigger_elem->strMessage);
 		trigger->msg = _strdup(trigger_elem->strMessage);
 	}
 
@@ -1917,8 +1834,6 @@ static int load_strategy_array(evt_engine_t* engine, slot_trigger_elem_t* peleme
 	const char* ns = pelement->slotns;
 	int rc = Error_Param;
 
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ns = %s.", pelement->slotns);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("pelement->islotarrlen = %d.", pelement->islotarrlen);
 	for (int islot = 0; islot < pelement->islotarrlen; islot++) {
 		if (load_slot_arrays(engine, ns, &pelement->slotarr[islot]) != 0) {
 			if (nIslog) {
@@ -1949,13 +1864,10 @@ int evt_engine_create(const evt_engine_callback_t *callback, evt_engine_t **p_en
 	evt_engine_t *engine = MALLOC_T(evt_engine_t);
 	
 	engine->filter_ht = htable_create(0);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("engine->filter_ht->size = %d.", engine->filter_ht->size);
 	
 	engine->sysvar_ht = htable_create(0);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("engine->sysvar_ht->size = %d.", engine->sysvar_ht->size);
 	
 	engine->slot_ht = htable_create(0);
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("engine->slot_ht->size = %d.", engine->slot_ht->size);
 	
 	INIT_LIST_HEAD(&engine->trigger_list);
 	spinlock_init(&engine->lock);
@@ -1989,11 +1901,6 @@ int evt_engine_load(evt_engine_t* engine, int* indexarr, int icount, slot_trigge
 				}
 				return rc;
 			}
-			else {
-				if (nIslog) {
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load strategy array success!");
-				}
-			}
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("invalid param.");
@@ -2008,10 +1915,6 @@ int evt_engine_load(evt_engine_t* engine, int* indexarr, int icount, slot_trigge
 		return rc;
 	}
 
-	if (nIslog) {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("build ref ok!");
-	}
-
 	return rc;
 }
 
@@ -2092,9 +1995,7 @@ int evt_engine_start(evt_engine_t *engine)
 		}
 		return rc;
 	}
-	if (nIslog){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe sysevent ok!");
-	}
+
 
 	for (i = 0; i < engine->sysvar_ht->size; ++i) {
 		evt_sysvar_t *tpos;
@@ -2103,15 +2004,9 @@ int evt_engine_start(evt_engine_t *engine)
 			CSimpleStringA strValue;
 			rc = engine->cb.get_sysevent(engine, tpos->key.code, strValue, engine->cb.user_data);
 			if (rc != 0) {
-				if (nIslog){
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("get sysvar %s failed! Error = %d", tpos->key.code, rc);
-				}
 				return rc;
 			} 
 			else {
-				if (nIslog){
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get sysvar %s ok! value=%s", tpos->key.code, strValue.GetData());
-				}
 				rc = process_sysvar(engine, tpos, NULL, strValue);
 				if (rc != 0) {
 					if (nIslog){
@@ -2119,11 +2014,6 @@ int evt_engine_start(evt_engine_t *engine)
 					}
 					return rc;
 				} 
-				else {
-					if (nIslog){
-						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("process sysvar %s ok! key = %s, value = %s", tpos->key.code, tpos->key.code, strValue.GetData());
-					}
-				}
 			}
 		}
 	}
@@ -2135,14 +2025,6 @@ int evt_engine_start(evt_engine_t *engine)
 			int kk;
 			for (kk = 0; kk < slot->arr_filter->nelts; ++kk) {
 				evt_filter_t *filter = ARRAY_IDX(slot->arr_filter, kk, evt_filter_t*);
-				//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("filter->log_type = %d, filter->ent_id = %d, entity = %s, filter->severity = %d, filter->sys_code = %d, filter->user_code = 0x%08x.", filter->log_type, filter->ent_id, filter->entity, filter->severity, filter->sys_code, filter->user_code);
-				//if (filter->content_to_var) {
-				//	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("filter->content_to_var->name = %s, filter->content_to_var->current_value = %s, filter->content_to_var->init_value = %s.", filter->content_to_var->name, filter->content_to_var->current_value, filter->content_to_var->init_value);
-				//}
-				//if ((filter->owner)) {
-				//	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("filter->owner->key.code = %s.", filter->owner->key.code);
-				//}
-				
 				rc = engine->cb.subscribe_log(engine, &filter->key.listen_id, 
 					(LogTypeEnum)filter->log_type, filter->entity, (SeverityLevelEnum)filter->severity, (ErrorCodeEnum)filter->sys_code, filter->user_code, filter->content_to_var ? false : true, engine->cb.user_data);
 				
@@ -2152,21 +2034,11 @@ int evt_engine_start(evt_engine_t *engine)
 					}
 					return rc;
 				} 
-				else {
-					if (nIslog){
-						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe log ok, id = %d", filter->key.listen_id);
-					}
-				}
+
 				filter_add(engine->filter_ht, filter);
 			}
 		}
 	}
-
-	if (nIslog){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe started!");
-	}
-
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("################################################");
 	
 	return rc;
 }
@@ -2202,10 +2074,6 @@ int evt_engine_stop(evt_engine_t *engine)
 		}
 		return rc;
 	}
-	
-	if (nIslog){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unsubscibe sysevent ok!");
-	}
 
 	return rc;
 }

Module/mod_evtconverter/mod_evtconverter.cpp

@@ -90,9 +90,6 @@ public:
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("create engine failed!");
 			return (ErrorCodeEnum)rc;
 		}
-		if (m_nIslog) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("create engine ok!");
-		}
 
 		if (num > 0) {
 			rc = evt_engine_load(engine, indexarr, num, slot_trigger_arr, sizeof(slot_trigger_arr)/sizeof(slot_trigger_elem_t));
@@ -163,24 +160,11 @@ public:
 
 	virtual void OnSysVarEvent(const char *pszKey,const char *pszValue,const char *pszOldValue,const char *pszEntityName)
 	{
-		//if (m_nIslog)
-		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process sysvar key=%s oldvalue=%s, value=%s", pszKey, pszOldValue, pszValue);
-		}
-		if (m_pEngine) 
-		{
+		if (m_pEngine) {
 			int rc = evt_engine_process_sysvar(m_pEngine, pszKey, pszValue, pszOldValue, pszEntityName);
-			if (rc != 0) 
-			{
+			if (rc != 0) {
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process sysvar failed! Error; %d, key=%s oldvalue=%s, value=%s", rc,pszKey, pszOldValue, pszValue);
 			}
-			else
-			{
-				if (m_nIslog)
-				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process sysvar success");
-				}			
-			}
 		}
 	}
 
@@ -188,9 +172,6 @@ public:
 		const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
 		const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage, const linkContext &pLinkInfo)
 	{
-		if (m_nIslog){
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("process eLogTpye = %d, dwUserCode = 0x%08x, %s", eLogType, dwUserCode, pszMessage);
-		}
 		if (m_pEngine) {
 			int rc = evt_engine_process_log(m_pEngine, SubIDs, nLogID, eLogType, eLevel, dwSysError, dwUserCode, wEntityDevelID, pszEntityName, pszModuleName, pszMessage);
 			if (rc != 0) {
@@ -246,12 +227,9 @@ private:
 		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);
-		} else {
+		} 
+		else {
 			*sub_id = (unsigned long long)uuid;
-			if (m_nIslog)
-			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe log ok!");
-			}
 		}
 		return (int)Error;
 	}
@@ -260,9 +238,6 @@ private:
 	{
 		ErrorCodeEnum Error = GetFunction()->UnsubscribeLog(sub_id);
 		if (Error == Error_Succeed) {
-			if (m_nIslog){
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unsubscribe log ok!");
-			}
 		} 
 		else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unsubscribe log failed! Error = %d", Error);
@@ -272,20 +247,12 @@ private:
 
 	int subscribe_sysevent()
 	{
-		if (m_nIslog){
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("subscribe sysevent!");
-		}
-
 		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
 		return (int)spEntityFunction->RegistSysVarEvent("*", this);
 	}
 
 	int unsubscribe_sysevent()
 	{
-		if (m_nIslog){
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unsubscribe sysevent!");
-		}
-
 		CSmartPointer<IEntityFunction> spEntityFunction = GetFunction();
 		return (int)spEntityFunction->UnregistSysVarEvent("*");
 	}