|
|
@@ -303,6 +303,7 @@ int add_log(log_group_builder* bder, long start_time, uint32_t pack_index, log_i
|
|
|
cJSON_AddItemToObject(skyeye_content, "ClientIP", cJSON_CreateString(local_ip_str));
|
|
|
}
|
|
|
cJSON_AddItemToObject(skyeye_content, "CostTime", cJSON_CreateNumber(log->CostTime));
|
|
|
+ cJSON_AddItemToObject(skyeye_content, "vtm_uuid", cJSON_CreateString(bder->grp->logs[bder->grp->n_logs].uuid));
|
|
|
cJSON_AddItemToObject(skyeye_content, "Version", cJSON_CreateString(bder->config->skyeyeVersion));
|
|
|
cJSON_AddItemToObject(skyeye_content, "DateTime", cJSON_CreateString(nowTime));
|
|
|
cJSON_AddItemToObject(skyeye_content, "ResultCode", cJSON_CreateString(log->ResultCode));
|
|
|
@@ -736,7 +737,7 @@ log_buf serialize_to_proto_buf_with_malloc(log_group_builder* bder)
|
|
|
{
|
|
|
return buf;
|
|
|
}
|
|
|
- buf.n_buffer = _log_pack(bder, &buf);//已通过该函数清�了��规范的模�
|
|
|
+ buf.n_buffer = _log_pack(bder, &buf);
|
|
|
buf.n_logs = bder->grp->n_logs;
|
|
|
buf.type = bder->grp->logs[0].type;
|
|
|
for (i = 0; i < buf.n_logs; i++) {
|
|
|
@@ -773,6 +774,7 @@ lz4_log_buf* serialize_to_proto_buf_with_malloc_lz4(log_group_builder* bder)
|
|
|
log_buf buf = serialize_to_proto_buf_with_malloc(bder);
|
|
|
int compress_bound = LZ4_compressBound(buf.n_buffer);
|
|
|
char* compress_data = (char*)malloc(compress_bound);
|
|
|
+ memset(compress_data, 0, compress_bound);
|
|
|
int compressed_size = LZ4_compress_default((char*)buf.buffer, compress_data, buf.n_buffer, compress_bound);
|
|
|
if (compressed_size <= 0)
|
|
|
{
|
chenliangyu