diff --git a/src/tsg_send_log.cpp b/src/tsg_send_log.cpp index f0c595c..585ec5c 100644 --- a/src/tsg_send_log.cpp +++ b/src/tsg_send_log.cpp @@ -1492,7 +1492,8 @@ static int set_xxxx_from_user_region(struct TLD_handle_t *_handle, struct tsg_lo } if(object==NULL) - { + { + TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)(_instance->vsystem_id), TLD_TYPE_LONG); return 0; } @@ -1505,6 +1506,16 @@ static int set_xxxx_from_user_region(struct TLD_handle_t *_handle, struct tsg_lo } } + item=cJSON_GetObjectItem(object, "vsys_id"); + if(item!=NULL) + { + TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)item->valueint, TLD_TYPE_LONG); + } + else + { + TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)_instance->vsystem_id, TLD_TYPE_LONG); + } + cJSON_Delete(object); object=NULL; @@ -2079,9 +2090,7 @@ int tsg_send_log(struct tsg_log_instance_t *instance, struct TLD_handle_t *handl { TLD_append(_handle, _instance->id2field[LOG_COMMON_DEVICE_TAG].name, (void *)(g_tsg_para.device_tag), TLD_TYPE_STRING); } - - TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)(_instance->vsystem_id), TLD_TYPE_LONG); - + set_application_behavior(_instance, _handle, log_msg->a_stream); for(i=0;iresult_num; i++)