1.添加对上报文件中CRL分发节点的添加

2.修改redis断开后本地签发证书处理
3.修改使用本地读取json文件时的bug
This commit is contained in:
fengweihao
2018-09-20 10:11:15 +08:00
parent 80de57b199
commit aefc29f997
6 changed files with 109 additions and 75 deletions

View File

@@ -64,19 +64,19 @@ static int load_module_config(char *config)
xret = MESA_load_profile_short_nodef(config, "LIBEVENT", "port", (short *)&(rte->addr_t.e_port));
if (xret < 0){
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Libevent Port invalid\n");
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Libevent Port invalid");
goto finish;
}
xret = MESA_load_profile_string_nodef(config, "REDIS", "ip", rte->addr_t.r_ip, 16);
if (xret < 0){
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Ip invalid\n");
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Ip invalid");
goto finish;
}
xret = MESA_load_profile_short_nodef(config, "REDIS", "port", (short *)&(rte->addr_t.r_port));
if (xret < 0){
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Redis Port invalid\n");
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Redis Port invalid");
goto finish;
}
finish:
@@ -102,7 +102,7 @@ static int load_maat_config(char *config)
}
if (maat_t->maat_json_switch == 1){
xret = MESA_load_profile_string_nodef(config, "CONFIG", "pxy_obj_keyring", maat_t->pxy_path, 128);
xret = MESA_load_profile_string_nodef(config, "NTC_MAAT", "pxy_obj_keyring", maat_t->pxy_path, 128);
if (xret < 0 && !rt_file_exsit(maat_t->pxy_path)){
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Read the pxy obj keyring failed or the (%s) does not exist",
maat_t->pxy_path);