🐞fix(package.cmake): 修复PROFILE描述错误的bug

snapshot目录更新至/tmp/MESA_handle_logger,同时增加按1小时回收文件的脚本，rpm安装后将安装至/usr/lib/tmpfiles.d/目录

.gitignore

@@ -11,7 +11,7 @@ build/
 core.*
 version.txt
 demo/test_handle_logger
-cmake-build-debug
+cmake-build-*
 build-*/
 GPATH
 GRTAGS

CMakeLists.txt

@@ -62,6 +62,7 @@ install(FILES inc/MESA_handle_logger.h   DESTINATION
     ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel)
 install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
 install(FILES inc/MESA_handle_logger.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
+install(FILES conf/MESA_handle_logger.conf DESTINATION /usr/lib/tmpfiles.d/ COMPONENT PROFILE)
 
 
 

cmake/Package.cmake

@@ -14,6 +14,9 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
 execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
 
+execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
+SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt)
+
 # RPM Build
 set(CPACK_GENERATOR "RPM")
 set(CPACK_RPM_PACKAGE_VENDOR "MESA")
@@ -35,6 +38,7 @@ set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VER
 set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries")
 set(CPACK_COMPONENT_EXECUTABLE_GROUP "libraries")
+set(CPACK_COMPONENT_PROFILE_GROUP "libraries")
 
 set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
@@ -43,7 +47,7 @@ set(CPACK_COMPONENT_HEADER_GROUP "header")
 set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
 set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
 
-set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE)
+set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE PROFILE)
 
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
 set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)

cmake/Version.cmake

@@ -3,7 +3,7 @@
 
 set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
 set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh)
-set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt)
+set(__VERSION_CACHE ${CMAKE_BINARY_DIR}/version.txt)
 set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake)
 
 file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR}

cmake/changelog.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+work_path=$1
+branch=`git status | grep branch | awk '{print $NF}'`
+git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B"  | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/  -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt

conf/MESA_handle_logger.conf

@@ -0,0 +1,2 @@
+#Type Path        Mode User Group Age Argument
+d /tmp/MESA_handle_logger/        	    0755 - -   1h -

src/MESA_handle_logger.c

@@ -94,14 +94,13 @@ static int get_filepath(int fp, char *buf, int buflen)
 {
     if(buf == NULL || buflen <=0)return -1;
     char proclnk[0xFFF] = "";
-    //int fno = fileno(fp);
     int fno = fp;
     sprintf(proclnk, "/proc/self/fd/%d", fno);
     int r = readlink(proclnk, buf, buflen);
     return r;
 }
 
-static char tmp_template[] = "/tmp/handle_loggger.XXXXXX";
+//static char tmp_template[] = "/tmp/MESA_handle_loggger/handle_loggger.XXXXXX";
 
 static void escape_for_zlog(char *in_buf, int buflen)
 {
@@ -129,11 +128,14 @@ static const char *loglevel_to_name(int level)
 static void snapshot_handle_info(const char *handle_name, const char *log_path, int level)
 {
     char zlog_rule_conf_content[MAX_HANDLE_LOG_PATH + 1] = "";
+    static char *tmp_prefix = "/tmp/MESA_handle_logger/";
     static char *zlog_conf_init_buff = "[global]\ndefault format = \"%d(%c), %V, %F, %U, %m%n\" \n[levels]\nDEBUG=10\nINFO=20\nFATAL=30\n[rules]";
     if (g_zlog_conf_fp == -1)
     {
+	    if (create_path("/tmp/MESA_handle_logger/", strlen(tmp_prefix)) < 0)
+		    return;
         char temp_filename[1024] = "";
-        sprintf(temp_filename, "/tmp/MESA_handle_logger_%d.XXXXXX", getpid());
+        sprintf(temp_filename, "/tmp/MESA_handle_logger/MESA_logger_snapshot_%d.XXXXXX", getpid());
         g_zlog_conf_fp = mkstemp(temp_filename);
         if (g_zlog_conf_fp == -1)
         {
@@ -173,7 +175,6 @@ void *MESA_create_runtime_log_handle(const char *file_path, int level)
 
     char handle_name[MAX_HANDLE_LOG_PATH];
     char *p_path_end = rindex(file_path, '/');
-
     char *p_name = p_path_end+1;
 
     strcpy(handle_name, file_path);
@@ -181,10 +182,12 @@ void *MESA_create_runtime_log_handle(const char *file_path, int level)
     p_name = handle_name;
 
 
-    //creating file_path failed, return NULL
-    if (create_path(file_path, p_path_end - file_path) < 0)
-        return NULL;
-
+    if(p_path_end != NULL && p_path_end > file_path)
+    {
+	    //creating file_path failed, return NULL
+	    if (create_path(file_path, p_path_end-file_path) < 0)
+		    return NULL;
+    }
     snapshot_handle_info(p_name, file_path, level);
     zlog_reload(NULL);
     zc = zlog_get_category(p_name);