修改日志文件路径.v4.2.41

6 files changed, 36 insertions, 31 deletions

diff --git a/bin/etc/sysconfig/sapp b/bin/etc/sysconfig/sapp
index f68f9ec..dc6253f 100644
--- a/bin/etc/sysconfig/sapp
+++ b/bin/etc/sysconfig/sapp
@@ -1 +1,2 @@
-SAPP_ROOT=/opt/tsg/sapp
\ No newline at end of file
+SAPP_ROOT=/opt/tsg/sapp
+SAPP_LOG_ROOT=/var/log/sapp
diff --git a/include/private/sapp_global_val.h b/include/private/sapp_global_val.h
index 7163122..69bacc2 100644
--- a/include/private/sapp_global_val.h
+++ b/include/private/sapp_global_val.h
@@ -7,11 +7,6 @@
 #include "sapp_limits.h"
 #include "stream_inc/stream_base.h"
 
-
-#define SAPP_CFG_SECONDARY_DIR  "sapp" /* �����в���-dָ�������ļ���Ŀ¼, ���ǻ��кܶ���, ����ƽ̨׷�Ӷ���Ŀ¼sapp, ��������ļ����洢��һ��Ŀ¼̫���� */
-#define SAPP_DATA_SECONDARY_DIR  SAPP_CFG_SECONDARY_DIR
-
-
 enum pkt_dump_mode{
 	PKT_DUMP_LOCAL_FILE		=	1, 
 	PKT_DUMP_UDP_SOCKET		=	2, 
diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 32cafda..f97829f 100644
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -1,7 +1,11 @@
+set(SAPP_LOG_PATH_VAR "\${SAPP_LOG_ROOT}")
+
 if(CAPTURE_MODE MATCHES "MARSIO")
-	execute_process(COMMAND cp ${PROJECT_SOURCE_DIR}/service/sapp_marsio.service.in ${CMAKE_BINARY_DIR}/service/sapp.service)
+	configure_file(${PROJECT_SOURCE_DIR}/service/sapp_marsio.service.in ${CMAKE_BINARY_DIR}/service/sapp.service)
+	#execute_process(COMMAND cp ${PROJECT_SOURCE_DIR}/service/sapp_marsio.service.in ${CMAKE_BINARY_DIR}/service/sapp.service)
 else()
-	execute_process(COMMAND cp ${PROJECT_SOURCE_DIR}/service/sapp_default.service.in ${CMAKE_BINARY_DIR}/service/sapp.service)
+    configure_file(${PROJECT_SOURCE_DIR}/service/sapp_default.service.in ${CMAKE_BINARY_DIR}/service/sapp.service)
+	#execute_process(COMMAND cp ${PROJECT_SOURCE_DIR}/service/sapp_default.service.in ${CMAKE_BINARY_DIR}/service/sapp.service)
 endif()
 
 install(FILES ${CMAKE_BINARY_DIR}/service/sapp.service DESTINATION /usr/lib/systemd/system)
diff --git a/service/sapp_default.service.in b/service/sapp_default.service.in
index 7285e81..9cc21b0 100644
--- a/service/sapp_default.service.in
+++ b/service/sapp_default.service.in
@@ -5,7 +5,8 @@ After=After=network.target
 [Service]
 Type=notify
 EnvironmentFile=/etc/sysconfig/sapp
-ExecStart=${SAPP_ROOT}/sapp -c ${SAPP_ROOT}/sapp/etc/sapp.toml -D /var/log/sapp
+WorkingDirectory=${CMAKE_INSTALL_PREFIX}
+ExecStart=${CMAKE_INSTALL_PREFIX}/sapp -c ${CMAKE_INSTALL_PREFIX}/etc/sapp.toml -C ${CMAKE_INSTALL_PREFIX} -D ${SAPP_LOG_PATH_VAR}
 TimeoutSec=300s
 RestartSec=10s
 Restart=always
diff --git a/service/sapp_marsio.service.in b/service/sapp_marsio.service.in
index f51bbe1..5dedd01 100644
--- a/service/sapp_marsio.service.in
+++ b/service/sapp_marsio.service.in
@@ -6,7 +6,8 @@ After=mrzcpd.service
 [Service]
 Type=notify
 EnvironmentFile=/etc/sysconfig/sapp
-ExecStart=${SAPP_ROOT}/sapp -c ${SAPP_ROOT}/sapp/etc/sapp.toml -D /var/log/sapp
+WorkingDirectory=${CMAKE_INSTALL_PREFIX}
+ExecStart=${CMAKE_INSTALL_PREFIX}/sapp -c ${CMAKE_INSTALL_PREFIX}/etc/sapp.toml -C ${CMAKE_INSTALL_PREFIX} -D ${SAPP_LOG_PATH_VAR}
 TimeoutSec=300s
 RestartSec=10s
 Restart=always
diff --git a/src/config/cmd_args.c b/src/config/cmd_args.c
index d958056..2bafbef 100644
--- a/src/config/cmd_args.c
+++ b/src/config/cmd_args.c
@@ -309,29 +309,28 @@ static int store_cmd_args(const char *opt_name, const char *opt_arg)
 }
 
 /*
-	������ļ�·��ת��Ϊ����·��, �������в���-c�������ļ��Ƿ�ʹ�þ���·��Ӱ��.
+	������ļ�·��ת��Ϊ����·��, �������в���-D�������ļ��Ƿ�ʹ�þ���·��Ӱ��.
+
+	sapp�Ķ�����־�ļ�·����sapp.toml��ȡ, 
+	����Ѿ��Ǿ���·��(����/��ʼ), �����������-D����, 
+	������-DΪ��Ŀ¼, ��׷��sapp.toml�е�·��Ϊ��Ŀ¼�����ļ�. 
 */
 static void sapp_convert_relative_to_absolute(const char *raw_relative_path, char **absolute_path, const char *cmd_arg_root_dir)
 {
 	int cfg_is_absolute_path;
-	char sapp_cfg_filename[PATH_MAX];
+	char tmp_filename[PATH_MAX];
 
 	cfg_is_absolute_path = sapp_is_absolute_path(raw_relative_path);
 
-	if(cmd_arg_root_dir){
-		if(cfg_is_absolute_path){
-			/* ���ָ����-c�����в���, �������ļ�ʹ���˾���·��, ����ì�ܵ�, ��ʹ�þ���·�������ļ��� */
-			snprintf(sapp_cfg_filename, PATH_MAX, "%s/%s/%s", cmd_arg_root_dir, SAPP_CFG_SECONDARY_DIR, basename(raw_relative_path));
-			*absolute_path = sapp_strdup(sapp_cfg_filename);
-		}else{
-			snprintf(sapp_cfg_filename, PATH_MAX, "%s/%s/%s", cmd_arg_root_dir, SAPP_CFG_SECONDARY_DIR, raw_relative_path);
-			*absolute_path = sapp_strdup(sapp_cfg_filename);
-		}
-	}else{
-		/* û��-c����, ֱ�Ӹ���sapp.tomlԭʼ��relative_path */
+	if(cfg_is_absolute_path){
+		/* ��/��ʼ��·��, absolute����  relative */
 		*absolute_path = sapp_strdup(raw_relative_path);	
+		return;
 	}
 
+	snprintf(tmp_filename, PATH_MAX, "%s/%s", cmd_arg_root_dir, raw_relative_path);
+	*absolute_path = sapp_strdup(tmp_filename);
+
 	return;
 }
 
@@ -346,7 +345,7 @@ void sapp_update_main_config_file(const char *main_entry_cfg)
 		pconfig->cfg_main_entry_absolute = sapp_strdup("./etc/sapp.toml");
 	}
 
-	/* ��Ϊsapp.toml���ܲ���Ĭ��ֵ��, �����»�ȡһ�������ļ����·�� */
+	/* ��Ϊ��-c����, sapp.toml���ܲ���Ĭ��·����, �����»�ȡһ�������ļ����·�� */
 	sapp_get_secondary_file_path();
 
 	/* sapp�Ķ��������ļ�·����sapp.toml��ȡ, ���������������, -C,-D�����ڲ�� */
@@ -362,6 +361,7 @@ void sapp_update_main_config_file(const char *main_entry_cfg)
 	sapp_convert_relative_to_absolute(pconfig->cfg_file_stream_compare_layer_relative, (char **)&pconfig->cfg_file_stream_compare_layer_absolute, cfg_root_dir);
 	sapp_convert_relative_to_absolute(pconfig->cfg_file_vlan_flipping_relative, (char **)&pconfig->cfg_file_vlan_flipping_absolute, cfg_root_dir);
 	sapp_convert_relative_to_absolute(pconfig->cfg_file_asymmetric_addr_layer_relative, (char **)&pconfig->cfg_file_asymmetric_addr_layer_absolute, cfg_root_dir);	
+	sapp_convert_relative_to_absolute(pconfig->cfg_file_well_known_port_relative, (char **)&pconfig->cfg_file_well_known_port_absolute, cfg_root_dir);	
 #else
 	pconfig->cfg_sapp_log_absolute = sapp_strdup(pconfig->cfg_sapp_log_relative);
 	pconfig->cfg_plug_list_absolute = sapp_strdup(pconfig->cfg_plug_list_relative);
@@ -406,7 +406,6 @@ void sapp_update_config_root_dir(const char *cfg_root_dir)
 
 void sapp_update_data_root_dir(const char *data_root_dir)
 {
-	char sapp_secondary_dir[PATH_MAX];
 	char sapp_data_filename[PATH_MAX];
 	sapp_data_file_link_t *pdata;
 	
@@ -421,16 +420,20 @@ void sapp_update_data_root_dir(const char *data_root_dir)
 		}
 			
 		pdata->data_files_root_dir = sapp_strdup(data_root_dir);
-		snprintf(sapp_secondary_dir, PATH_MAX, "%s/%s", data_root_dir, SAPP_DATA_SECONDARY_DIR);
-		MESA_mkdir_p(sapp_secondary_dir, 0755);		
+		MESA_mkdir_p(data_root_dir, 0755);		
 	}else{
 		pdata->data_files_root_dir = sapp_strdup("./");
 	}	
 
-#if 0 /* sapp�Ķ�����־�ļ�·����sapp.toml��ȡ, ���������������, -C,-D�����ڲ�� */
-	sapp_convert_relative_to_absolute(pdata->data_sapp_sysinfo_log_relative, (char **)&pdata->data_sapp_sysinfo_log_absolute, data_root_dir);
-	sapp_convert_relative_to_absolute(pdata->data_sapp_fs2_log_relative, (char **)&pdata->data_sapp_fs2_log_absolute, data_root_dir);
-	sapp_convert_relative_to_absolute(pdata->data_inline_keepalive_log_relative, (char **)&pdata->data_inline_keepalive_log_absolute, data_root_dir);	
+	/* sapp�Ķ�����־�ļ�·����sapp.toml��ȡ, 
+	   ����Ѿ��Ǿ���·��(����/��ʼ), �����������-D����, 
+	   ������-DΪ��Ŀ¼, ��׷��sapp.toml�е�·��Ϊ��Ŀ¼�����ļ�. 
+	*/
+#if 1 
+	sapp_convert_relative_to_absolute(pdata->data_sapp_sysinfo_log_relative, (char **)&pdata->data_sapp_sysinfo_log_absolute, pdata->data_files_root_dir);
+	sapp_convert_relative_to_absolute(pdata->data_sapp_fs2_log_relative, (char **)&pdata->data_sapp_fs2_log_absolute, pdata->data_files_root_dir);
+	sapp_convert_relative_to_absolute(pdata->data_inline_keepalive_log_relative, (char **)&pdata->data_inline_keepalive_log_absolute, pdata->data_files_root_dir);	
+	sapp_convert_relative_to_absolute(pdata->data_load_plugin_stat_log_relative, (char **)&pdata->data_load_plugin_stat_log_absolute, pdata->data_files_root_dir);	
 #else
 	pdata->data_sapp_sysinfo_log_absolute = sapp_strdup(pdata->data_sapp_sysinfo_log_relative);
 	pdata->data_sapp_fs2_log_absolute = sapp_strdup(pdata->data_sapp_fs2_log_relative);