From 2b2f1f4a659964662a0ee3d071890a304e9a05d6 Mon Sep 17 00:00:00 2001 From: tongzongzhen Date: Mon, 20 May 2024 10:28:28 +0800 Subject: kafka dump to log congif load form dynamic --- src/config.c | 3 +++ src/logger.c | 7 ++----- src/trace_output.c | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/config.c b/src/config.c index a70e5d4..216d726 100644 --- a/src/config.c +++ b/src/config.c @@ -191,6 +191,9 @@ void dynamic_config_load() MESA_load_profile_uint_def(g_conf->dy_config_path, "debug", "arp_pkt_has_ip_test", &(g_conf->arp_pkt_has_ip_test), 0); + dzlog_info("send_ctrlbuf:%u", g_conf->send_ctrlbuf); + dzlog_info("kafka_dump_to_log:%u", g_conf->kafka_dump_to_log); + dzlog_info("arp_pkt_has_ip_test:%u", g_conf->arp_pkt_has_ip_test); dzlog_info("Loading data path trace configuration file is completed."); } diff --git a/src/logger.c b/src/logger.c index b6bb75e..14bc5c8 100644 --- a/src/logger.c +++ b/src/logger.c @@ -20,11 +20,8 @@ void logger_init() } zlog_env_is_init = 1; - if (conf->kafka_dump_to_log) - { - ret = zlog_init(conf->zlog_config_path); - DP_TRACE_VERIFY(ret != 0, "zlog init failed."); - } + ret = zlog_init(conf->zlog_config_path); + DP_TRACE_VERIFY(ret != 0, "zlog init failed."); } zlog_category_t * kafka_dump_logger_get() diff --git a/src/trace_output.c b/src/trace_output.c index d3f48a4..19ccf2c 100644 --- a/src/trace_output.c +++ b/src/trace_output.c @@ -123,8 +123,6 @@ void * dp_trace_process_thread(void * arg) marsio_thread_init(mr_instance); - zlog_category_t * kafak_dump_logger = kafka_dump_logger_get(); - unsigned int no_pkt_recv_cnt = 0; for (unsigned int qid_index = 0;; qid_index++) { @@ -182,6 +180,7 @@ void * dp_trace_process_thread(void * arg) if (conf->kafka_dump_to_log) { + zlog_category_t * kafak_dump_logger = kafka_dump_logger_get(); kafka_dump_to_log(kafak_dump_logger, (void *)data, size); } @@ -764,11 +763,11 @@ void arp_pkt_no_ip_verify(marsio_buff_t * mr_mbuf) if (strlen(trace_buff_info.inner_src_addr_str) != 0) { - dzlog_error("arp pkt has inner src ip:", trace_buff_info.inner_src_addr_str); + dzlog_error("arp pkt has inner src ip:%s", trace_buff_info.inner_src_addr_str); } if (strlen(trace_buff_info.inner_dst_addr_str) != 0) { - dzlog_error("arp pkt has inner dst ip:", trace_buff_info.inner_dst_addr_str); + dzlog_error("arp pkt has inner dst ip:%s", trace_buff_info.inner_dst_addr_str); } } -- cgit v1.2.3