gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-11767: 停止发送common_namespace_id公共日志字段

Browse Source
This commit is contained in:
liuxueli
2022-08-23 10:37:28 +08:00
parent c558ea4b71
commit d9132ee285
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tsg_log_field.conf
View File

@@ -116,4 +116,3 @@ STRING http_request_body 103
STRING http_response_body 104 STRING http_response_body 104
STRING mail_eml_file 105 STRING mail_eml_file 105
STRING common_vsys_id 106 STRING common_vsys_id 106
STRING common_namespace_id 107

12
src/tsg_send_log.cpp
View File

@@ -1503,16 +1503,6 @@ static int set_xxxx_from_user_region(struct TLD_handle_t *_handle, struct tsg_lo
} }
} }
item=cJSON_GetObjectItem(object, "namespace_id");
if(item!=NULL)
{
TLD_append(_handle, _instance->id2field[LOG_COMMON_NAMESPACE_ID].name, (void *)(long)item->valueint, TLD_TYPE_LONG);
}
else
{
TLD_append(_handle, _instance->id2field[LOG_COMMON_NAMESPACE_ID].name, (void *)(long)_instance->namespace_id, TLD_TYPE_LONG);
}
cJSON_Delete(object); cJSON_Delete(object);
object=NULL; object=NULL;
@@ -1838,7 +1828,6 @@ struct tsg_log_instance_t *tsg_sendlog_init(const char *conffile, screen_stat_ha
MESA_load_profile_int_def(conffile, "TSG_LOG", "RAPIDJSON_CHUNK_CAPACITY", &(_instance->rapidjson_chunk_capacity), 8096); MESA_load_profile_int_def(conffile, "TSG_LOG", "RAPIDJSON_CHUNK_CAPACITY", &(_instance->rapidjson_chunk_capacity), 8096);
MESA_load_profile_int_def(conffile, "TSG_LOG", "VSYSTEM_ID", &(_instance->vsystem_id), 1); MESA_load_profile_int_def(conffile, "TSG_LOG", "VSYSTEM_ID", &(_instance->vsystem_id), 1);
MESA_load_profile_int_def(conffile, "TSG_LOG", "NAMESPACE_ID", &(_instance->namespace_id), 1);
MESA_load_profile_int_def(conffile, "TSG_LOG", "APP_ID_TYPE", &(_instance->app_id_type), 1); //0: int, 1: string MESA_load_profile_int_def(conffile, "TSG_LOG", "APP_ID_TYPE", &(_instance->app_id_type), 1); //0: int, 1: string
MESA_load_profile_string_def(conffile, "TSG_LOG", "L7_UNKNOWN_NAME", _instance->l7_unknown_name, sizeof(_instance->l7_unknown_name), "UNCATEGORIZED"); MESA_load_profile_string_def(conffile, "TSG_LOG", "L7_UNKNOWN_NAME", _instance->l7_unknown_name, sizeof(_instance->l7_unknown_name), "UNCATEGORIZED");
@@ -2160,7 +2149,6 @@ int tsg_send_log(struct tsg_log_instance_t *instance, struct TLD_handle_t *handl
TLD_delete(_handle, _instance->id2field[LOG_COMMON_ACTION].name); TLD_delete(_handle, _instance->id2field[LOG_COMMON_ACTION].name);
TLD_delete(_handle, _instance->id2field[LOG_COMMON_USER_REGION].name); TLD_delete(_handle, _instance->id2field[LOG_COMMON_USER_REGION].name);
TLD_delete(_handle, _instance->id2field[LOG_COMMON_SUB_ACTION].name); TLD_delete(_handle, _instance->id2field[LOG_COMMON_SUB_ACTION].name);
TLD_delete(_handle, _instance->id2field[LOG_COMMON_NAMESPACE_ID].name);
} }
TLD_cancel(handle); TLD_cancel(handle);

2
src/tsg_send_log_internal.h
View File

@@ -126,7 +126,6 @@ typedef enum _tsg_log_field_id
LOG_COMMON_HTTP_RESPONSE_S3_FILE, LOG_COMMON_HTTP_RESPONSE_S3_FILE,
LOG_COMMON_MAIL_EML_FILE, LOG_COMMON_MAIL_EML_FILE,
LOG_COMMON_VSYSTEM_ID, LOG_COMMON_VSYSTEM_ID,
LOG_COMMON_NAMESPACE_ID,
LOG_COMMON_MAX LOG_COMMON_MAX
}tsg_log_field_id_t; }tsg_log_field_id_t;
@@ -194,7 +193,6 @@ struct tsg_log_instance_t
int max_service; int max_service;
int app_id_type; int app_id_type;
int vsystem_id; int vsystem_id;
int namespace_id;
int send_user_region; int send_user_region;
int send_data_center; int send_data_center;
int recovery_interval; int recovery_interval;