From 8077136bc7d112727a97ccaee1a9a787e2d67cb8 Mon Sep 17 00:00:00 2001 From: fengweihao Date: Tue, 25 May 2021 15:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=BF=E7=A8=8B=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=A1=BA=E5=BA=8F=E5=AF=BC=E8=87=B4Redis?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=BB=BA=E8=81=94=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- program/src/cert_conf.cpp | 1 - program/src/cert_session.cpp | 22 +++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/program/src/cert_conf.cpp b/program/src/cert_conf.cpp index 4606603..c4816ff 100644 --- a/program/src/cert_conf.cpp +++ b/program/src/cert_conf.cpp @@ -123,7 +123,6 @@ static int load_module_config(const char *config) mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Certsotre redis port invalid"); goto finish; } - finish: return xret; } diff --git a/program/src/cert_session.cpp b/program/src/cert_session.cpp index 8897f96..0753aa7 100644 --- a/program/src/cert_session.cpp +++ b/program/src/cert_session.cpp @@ -2015,24 +2015,32 @@ redis_link_detection(uint32_t __attribute__((__unused__)) uid, x509_forge_thread *threads = (x509_forge_thread *)argv; unsigned int thread_nu = cfg_instanec()->thread_nu; - for (tid = 0; tid < (int)thread_nu; tid++) { + for (tid = 0; tid < (int)thread_nu; tid++) + { info = threads + tid; - if(info->sync == NULL){ + if(info->sync == NULL && info->base != NULL) + { redisFree(info->sync); xret = redis_sync_init(&info->sync); - if (xret < 0 || !info->sync){ + if (xret < 0 || !info->sync) + { mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "[%d]trying to connect sync redis failed", tid); continue; - }else{ + } + else + { mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "[%d]trying to connect sync redis success", tid); } if(cfg_instanec()->mode) { - xret = redis_rsync_init(info->base, &info->cl_ctx); - if (xret < 0 || !info->cl_ctx){ + xret = redis_rsync_init(info->base, &info->cl_ctx); + if (xret < 0 || !info->cl_ctx) + { mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "[%d]trying to connect rsync redis failed", tid); - }else{ + } + else + { mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "[%d]trying to connect rsync redis success", tid); } }