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

merged 冲突

Browse Source
This commit is contained in:
luwenpeng
2019-12-24 13:49:21 +08:00
parent 8e58380a8a a3856d20e7
commit ffcac0c94c
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
conf/tfe/tfe.conf
View File

@@ -29,9 +29,15 @@ mc_cache_enable=1
# default eth0 # default eth0
mc_cache_eth=eth0 mc_cache_eth=eth0
# default NULL # default NULL
<<<<<<< HEAD
mc_cache_broker_list=192.168.40.224:9092 mc_cache_broker_list=192.168.40.224:9092
# default PXY-EXCH-INTERMEDIA-CERT # default PXY-EXCH-INTERMEDIA-CERT
mc_cache_topic=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] [key_keeper]
#Mode: debug - generate cert with ca_path, normal - generate cert with cert store #Mode: debug - generate cert with ca_path, normal - generate cert with cert store

4
platform/src/ssl_fetch_cert.cpp
View File

@@ -135,7 +135,11 @@ int ssl_mid_cert_kafka_logger_create(const char *profile, const char *section)
goto error; 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), "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); g_kafka_logger->topic = rd_kafka_topic_new(g_kafka_logger->handle, g_kafka_logger->topic_name, NULL);
if (g_kafka_logger->topic == 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); TFE_LOG_ERROR(g_default_logger, "%s, Fail to create kafka topic with broker list: %s.", errstr, g_kafka_logger->broker_list);