TSG-7498, inline keepalive统计状态默认输出到telefraf, 且不受配置文件控制.v4.2.48

1 files changed, 16 insertions, 13 deletions

diff --git a/src/inner_plug/g_device_plug.cpp b/src/inner_plug/g_device_plug.cpp
index 7958207..7bf791e 100644
--- a/src/inner_plug/g_device_plug.cpp
+++ b/src/inner_plug/g_device_plug.cpp
@@ -633,7 +633,7 @@ static void *gdev_keepalive_log_thread(void *arg)
 		__gdev_keepalive_pkt_calc_pps();
 		gdev_keepalive_update_local_log();
 		gdev_keepalive_update_fs2();
-		gdev_keepalive_clear_stat(); /* ÿ����ռ���, ֻ����һ��ʱ������� */
+		//gdev_keepalive_clear_stat(); /* ÿ����ռ���, ֻ����һ��ʱ������� */
 	}
 
 	return NULL;
@@ -766,7 +766,7 @@ static int gdev_keepalive_fs2_init(void)
 		prometheus��ص�����, ��  	   sapp_fs2_init() ��ʼ��.
 	*/
 
-	fs2_opt = 5;
+	fs2_opt = sapp_global_val->config.profiling.log.interval;
 	FS_set_para(gdev_keepalive_fs2_handle, STAT_CYCLE, &fs2_opt, sizeof(int));	
 
 	fs2_opt = 1; /* 1:Rewrite ,2: Append.  */
@@ -774,24 +774,27 @@ static int gdev_keepalive_fs2_init(void)
 
 	fs2_opt = 1;
 	FS_set_para(gdev_keepalive_fs2_handle, PRINT_TRIGGER, &fs2_opt, sizeof(int));
-	FS_set_para(gdev_keepalive_fs2_handle, OUTPUT_DEVICE, "./fs2_inline_keepalive.log", strlen("./fs2_inline_keepalive.log") + 1); 
 
-	fs2_opt = 1;
-    FS_set_para(gdev_keepalive_fs2_handle, NOT_SEND_METRIC_TO_SERVER, &fs2_opt, sizeof(int));
+	if(sapp_global_val->config.profiling.log.local.enabled){
+		FS_set_para(gdev_keepalive_fs2_handle, OUTPUT_DEVICE, "./fs2_inline_keepalive.log", strlen("./fs2_inline_keepalive.log") + 1); 
+	}
 	
 	FS_set_para(gdev_keepalive_fs2_handle, APP_NAME, "keepalive", strlen("keepalive")+1);
 
-	FS_set_para(gdev_keepalive_fs2_handle, STATS_SERVER_IP, (void *)sapp_global_val->config.profiling.log.remote.server_ip, strlen(sapp_global_val->config.profiling.log.remote.server_ip)+1);
-	fs_server_port = (unsigned short)sapp_global_val->config.profiling.log.remote.server_port;
-	FS_set_para(gdev_keepalive_fs2_handle, STATS_SERVER_PORT, &fs_server_port, sizeof(short));
-
-	fs2_opt = 1;
-	FS_set_para(gdev_keepalive_fs2_handle, OUTPUT_PROMETHEUS, &fs2_opt, sizeof(int));
+	if(sapp_global_val->config.profiling.log.remote.enabled){
+		FS_set_para(gdev_keepalive_fs2_handle, STATS_SERVER_IP, (void *)sapp_global_val->config.profiling.log.remote.server_ip, strlen(sapp_global_val->config.profiling.log.remote.server_ip)+1);
+		fs_server_port = (unsigned short)sapp_global_val->config.profiling.log.remote.server_port;
+		FS_set_para(gdev_keepalive_fs2_handle, STATS_SERVER_PORT, &fs_server_port, sizeof(short));
+	}
 
+	if(sapp_global_val->config.profiling.log.prometheus.enabled){
+		fs2_opt = 1;
+		FS_set_para(gdev_keepalive_fs2_handle, OUTPUT_PROMETHEUS, &fs2_opt, sizeof(int));
+	}
 
 	/* ��ע����, ��ʼ����̶�����, ����ipΪ��λ��̬ע��, gdev_keepalive_dynamic_register_fs2_line() */
-	gdev_keepalive_fs2_column_id_array[FS2_COLUMN_REQUEST_NUM] = FS_register(gdev_keepalive_fs2_handle, FS_STYLE_COLUMN, FS_CALC_CURRENT, "req_pkt");
-	gdev_keepalive_fs2_column_id_array[FS2_COLUMN_REPLY_NUM] = FS_register(gdev_keepalive_fs2_handle, FS_STYLE_COLUMN, FS_CALC_CURRENT, "rpy_pkt");
+	gdev_keepalive_fs2_column_id_array[FS2_COLUMN_REQUEST_NUM] = FS_register(gdev_keepalive_fs2_handle, FS_STYLE_COLUMN, FS_CALC_SPEED, "req_pkt");
+	gdev_keepalive_fs2_column_id_array[FS2_COLUMN_REPLY_NUM] = FS_register(gdev_keepalive_fs2_handle, FS_STYLE_COLUMN, FS_CALC_SPEED, "rpy_pkt");
 
 	FS_start(gdev_keepalive_fs2_handle);