diff options
| -rw-r--r-- | etc/dp_trace.conf | 7 | ||||
| -rw-r--r-- | etc/dp_trace_dy.conf | 7 | ||||
| -rw-r--r-- | src/config.c | 13 |
3 files changed, 11 insertions, 16 deletions
diff --git a/etc/dp_trace.conf b/etc/dp_trace.conf index a213ee2..a4d990b 100644 --- a/etc/dp_trace.conf +++ b/etc/dp_trace.conf @@ -26,4 +26,9 @@ table_schema=../etc/table_schema.json json_cfg_file=../etc/dp_telemetry_rules.json maat_redis_server=192.168.44.3 maat_redis_port_range=7002 -maat_redis_db_index=1
\ No newline at end of file +maat_redis_db_index=1 + +[debug] +send_ctrlbuf=0 +kafka_dump_to_log=0 +arp_pkt_has_ip_test=0
\ No newline at end of file diff --git a/etc/dp_trace_dy.conf b/etc/dp_trace_dy.conf index 47d5e75..4c0b92d 100644 --- a/etc/dp_trace_dy.conf +++ b/etc/dp_trace_dy.conf @@ -7,9 +7,4 @@ enable=0 bpf_expr=ether host 00:15:5d:b8:10:a6 pkt_cnt_max=0 sampling=1 -snaplen=0 - -[debug] -send_ctrlbuf=0 -kafka_dump_to_log=0 -arp_pkt_has_ip_test=0
\ No newline at end of file +snaplen=0
\ No newline at end of file diff --git a/src/config.c b/src/config.c index 216d726..df50762 100644 --- a/src/config.c +++ b/src/config.c @@ -121,6 +121,10 @@ void config_load() MESA_load_profile_string_def(config_path, "maat", "maat_redis_port_range", g_conf->redis_port_range, sizeof(g_conf->redis_server), "6379"); MESA_load_profile_int_def(config_path, "maat", "maat_redis_db_index", &(g_conf->redis_db_idx), 0); + + MESA_load_profile_uint_def(config_path, "debug", "send_ctrlbuf", &g_conf->send_ctrlbuf, 0); + MESA_load_profile_uint_def(config_path, "debug", "kafka_dump_to_log", &(g_conf->kafka_dump_to_log), 0); + MESA_load_profile_uint_def(config_path, "debug", "arp_pkt_has_ip_test", &(g_conf->arp_pkt_has_ip_test), 0); } void dynamic_config_load() @@ -185,15 +189,6 @@ void dynamic_config_load() desc_i->measurement_type = DP_TRACE_MEASUREMENT_TYPE_TRACE; } - - MESA_load_profile_uint_def(g_conf->dy_config_path, "debug", "send_ctrlbuf", &g_conf->send_ctrlbuf, 0); - MESA_load_profile_uint_def(g_conf->dy_config_path, "debug", "kafka_dump_to_log", &(g_conf->kafka_dump_to_log), 0); - 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."); } |