diff options
| author | luwenpeng <[email protected]> | 2019-12-24 13:52:40 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2019-12-24 13:52:40 +0800 |
| commit | d6d5560564c66909e14beef49dabd5fe53126041 (patch) | |
| tree | 5d9c2c83b4d2194dcc3f7d6f57c8ac1c6d14c871 | |
| parent | ffcac0c94c428377ade24f8532ce4fc443311400 (diff) | |
更新配置文件，设置中间缓存可信证书的 topic 为 PXY-EXCH-INTERMEDIA-CERT
| -rw-r--r-- | conf/tfe/tfe.conf | 6 | ||||
| -rw-r--r-- | platform/src/ssl_fetch_cert.cpp | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/conf/tfe/tfe.conf b/conf/tfe/tfe.conf index 4d02e87..0c429ec 100644 --- a/conf/tfe/tfe.conf +++ b/conf/tfe/tfe.conf @@ -29,15 +29,9 @@ mc_cache_enable=1 # default eth0 mc_cache_eth=eth0 # default NULL -<<<<<<< HEAD mc_cache_broker_list=192.168.40.224:9092 # default PXY-EXCH-INTERMEDIA-CERT mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT -======= -mc_cache_broker_list= -# default MID-CERT-CACHE-LOG -mc_cache_topic=MID-CERT-CACHE-LOG ->>>>>>> a3856d20e7f702b74de5173ecf23538eadd0184a [key_keeper] #Mode: debug - generate cert with ca_path, normal - generate cert with cert store diff --git a/platform/src/ssl_fetch_cert.cpp b/platform/src/ssl_fetch_cert.cpp index cc925b3..c034d01 100644 --- a/platform/src/ssl_fetch_cert.cpp +++ b/platform/src/ssl_fetch_cert.cpp @@ -135,11 +135,7 @@ int ssl_mid_cert_kafka_logger_create(const char *profile, const char *section) goto error; } -<<<<<<< HEAD MESA_load_profile_string_def(profile, section, "mc_cache_topic", g_kafka_logger->topic_name, sizeof(g_kafka_logger->topic_name), "PXY-EXCH-INTERMEDIA-CERT"); -======= - MESA_load_profile_string_def(profile, section, "mc_cache_topic", g_kafka_logger->topic_name, sizeof(g_kafka_logger->topic_name), "MID-CERT-CACHE-LOG"); ->>>>>>> a3856d20e7f702b74de5173ecf23538eadd0184a g_kafka_logger->topic = rd_kafka_topic_new(g_kafka_logger->handle, g_kafka_logger->topic_name, NULL); if (g_kafka_logger->topic == NULL) { TFE_LOG_ERROR(g_default_logger, "%s, Fail to create kafka topic with broker list: %s.", errstr, g_kafka_logger->broker_list); |