1、增加ansn 部署选项 2、增加fs write out 格式配置v20.10.20201014

1 files changed, 3 insertions, 2 deletions

diff --git a/entry/src/kni_entry.cpp b/entry/src/kni_entry.cpp
index cd18f73..524e74a 100644
--- a/entry/src/kni_entry.cpp
+++ b/entry/src/kni_entry.cpp
@@ -1021,7 +1021,7 @@ static struct _session_attribute_label_t * kni_pull_session_attribute_results(st
 		{
 			for(int i= 0; i < session_attribute_label->fqdn_category_id_num; i ++)
 			{
-				KNI_LOG_DEBUG(logger, "share-session-attribute: fqdn_category_id[%d] = %u,stream traceid = %s",i,session_attribute_label->fqdn_category_id[i]);
+				KNI_LOG_DEBUG(logger, "share-session-attribute: fqdn_category_id[%d] = %u,stream traceid = %s",i,session_attribute_label->fqdn_category_id[i],pmeinfo->stream_traceid);
 			}
 		}
 		
@@ -2025,12 +2025,13 @@ static struct kni_field_stat_handle * fs_init(const char *profile){
 	char local_path[KNI_PATH_MAX];
 	struct kni_field_stat_handle *fs_handle = NULL;
 	screen_stat_handle_t handle = NULL;
-	const char *app_name = "fs2_kni";
+	char app_name[MAX_STRING_LEN]={0};
 	int value = 0, ret, stat_cycle, print_mode;
 	int remote_switch = 0;
 	char remote_ip[INET_ADDRSTRLEN];
 	int remote_port;
 	int statsd_format = FS_OUTPUT_STATSD;
+	MESA_load_profile_string_def(profile, section, "APP_NAME", app_name, sizeof(app_name), "fs2_kni");
 	MESA_load_profile_int_def(profile, section, "remote_switch", &remote_switch, 0);
 	MESA_load_profile_string_def(profile, section, "local_path", local_path, sizeof(local_path), "./fs2_kni.status");
 	KNI_LOG_ERROR(logger, "MESA_prof_load, [%s]:\n remote_switch: %d\n local_path: %s", section, remote_switch, local_path);