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

MAAT_JSON中不再需要compile_name和group_name字段。

Browse Source
This commit is contained in:
zhengchao
2017-07-04 10:01:56 +08:00
parent fa3c675fd9
commit ae263ee3c4
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/entry/Maat_api.cpp
View File

@@ -526,7 +526,9 @@ int Maat_set_feather_opt(Maat_feather_t feather,enum MAAT_INIT_OPT type,const vo
memcpy(_feather->inc_dir,(const char*)value,size); memcpy(_feather->inc_dir,(const char*)value,size);
break; break;
case MAAT_OPT_JSON_FILE_PATH: case MAAT_OPT_JSON_FILE_PATH:
ret=json2iris((const char*)value, _feather->full_dir,sizeof(_feather->full_dir),_feather->logger); ret=json2iris((const char*)value, _feather->full_dir
,_feather->compile_tn,_feather->group_tn
,sizeof(_feather->full_dir),_feather->logger);
if(ret<0) if(ret<0)
{ {
return -1; return -1;

28
src/entry/json2iris.cpp
View File

@@ -53,7 +53,7 @@ struct traslate_command_t
const char* default_string; const char* default_string;
int default_int; int default_int;
}; };
int set_iris_descriptor(const char* json_file,cJSON *json,struct iris_description_t *iris_cfg,void * logger) int set_iris_descriptor(const char* json_file,cJSON *json,const char*compile_tn,const char* group_tn,struct iris_description_t *iris_cfg,void * logger)
{ {
cJSON* j=NULL; cJSON* j=NULL;
char* table_name=NULL; char* table_name=NULL;
@@ -62,26 +62,12 @@ int set_iris_descriptor(const char* json_file,cJSON *json,struct iris_descriptio
snprintf(iris_cfg->tmp_iris_index_dir,sizeof(iris_cfg->tmp_iris_index_dir),"%s_iris_tmp/index",json_file); snprintf(iris_cfg->tmp_iris_index_dir,sizeof(iris_cfg->tmp_iris_index_dir),"%s_iris_tmp/index",json_file);
snprintf(iris_cfg->index_path,sizeof(iris_cfg->index_path),"%s/full_config_index.%010d",iris_cfg->tmp_iris_index_dir,json_version); snprintf(iris_cfg->index_path,sizeof(iris_cfg->index_path),"%s/full_config_index.%010d",iris_cfg->tmp_iris_index_dir,json_version);
j=cJSON_GetObjectItem(json, "compile_table");
if(j==NULL) memcpy(iris_cfg->compile_table.table_name,compile_tn,strlen(compile_tn));
{
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_json,
"compile_table not defined.");
return -1;
}
table_name=j->valuestring;
memcpy(iris_cfg->compile_table.table_name,table_name,strlen(table_name));
snprintf(iris_cfg->compile_table.table_path,sizeof(iris_cfg->compile_table.table_path), snprintf(iris_cfg->compile_table.table_path,sizeof(iris_cfg->compile_table.table_path),
"%s/%s.local",iris_cfg->tmp_iris_dir,iris_cfg->compile_table.table_name); "%s/%s.local",iris_cfg->tmp_iris_dir,iris_cfg->compile_table.table_name);
j=cJSON_GetObjectItem(json, "group_table");
if(j==NULL) memcpy(iris_cfg->group_table.table_name,group_tn,strlen(group_tn));
{
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_json,
"group_table not defined.");
return -1;
}
table_name=j->valuestring;
memcpy(iris_cfg->group_table.table_name,table_name,strlen(table_name));
snprintf(iris_cfg->group_table.table_path,sizeof(iris_cfg->group_table.table_name), snprintf(iris_cfg->group_table.table_path,sizeof(iris_cfg->group_table.table_name),
"%s/%s.local",iris_cfg->tmp_iris_dir,iris_cfg->group_table.table_name); "%s/%s.local",iris_cfg->tmp_iris_dir,iris_cfg->group_table.table_name);
@@ -895,7 +881,7 @@ int write_iris(cJSON *json,struct iris_description_t *p_iris,void* logger)
} }
return 0; return 0;
} }
int json2iris(const char* json_file,char* iris_dir_buf,int buf_len,void* logger) int json2iris(const char* json_file,const char*compile_tn,const char* group_tn,char* iris_dir_buf,int buf_len,void* logger)
{ {
FILE* json_fp=NULL; FILE* json_fp=NULL;
cJSON *json=NULL; cJSON *json=NULL;
@@ -939,7 +925,7 @@ int json2iris(const char* json_file,char* iris_dir_buf,int buf_len,void* logger)
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_json,"Error before: %-200.200s",cJSON_GetErrorPtr()); MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_json,"Error before: %-200.200s",cJSON_GetErrorPtr());
goto error_out; goto error_out;
} }
ret=set_iris_descriptor(json_file,json, &iris_cfg,logger); ret=set_iris_descriptor(json_file,json,compile_tn,group_tn,&iris_cfg,logger);
if(ret<0) if(ret<0)
{ {
goto error_out; goto error_out;

2
src/entry/json2iris.h
View File

@@ -1,2 +1,2 @@
int json2iris(const char* json_file,char* iris_dir_buf,int buf_len,void* logger); int json2iris(const char* json_file,const char*compile_tn,const char* group_tn,char* iris_dir_buf,int buf_len,void* logger);