✨ feat(printf): 使用fprintf输出屏显至stderr，替换printf

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

.gitlab-ci.yml

@@ -3,6 +3,7 @@ variables:
   GIT_STRATEGY: "clone"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
   INSTALL_PREFIX: "/opt/MESA/lib/"
+  INSTALL_DEPENDENCY_LIBRARY:  ""
 
 stages:
 - build
@@ -49,6 +50,10 @@ develop_build_debug:
   variables:
     BUILD_TYPE: Debug
     PACKAGE: 1
+    UPLOAD_RPM: 1
+    ASAN_OPTION: ADDRESS
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
     name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
     paths:
@@ -64,6 +69,10 @@ develop_build_release:
   variables:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
+    UPLOAD_RPM: 1
+    ASAN_OPTION: "OFF"
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
     name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
     paths:
@@ -74,12 +83,30 @@ develop_build_release:
     - /^master.*$/i
 
 
+release_build_debug:
+  stage: build
+  variables:
+    BUILD_TYPE:  Debug
+    PACKAGE: 1
+    UPLOAD_RPM: 1
+    PULP3_REPO_NAME: framework-stable-x86_64.el7
+    PULP3_DIST_NAME: framework-stable-x86_64.el7
+  extends: .build_by_travis
+  artifacts:
+    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*.rpm
+  only:
+    - tags
+
 release_build_release:
   stage: build
   variables:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
-    UPLOAD: 1
+    UPLOAD_RPM: 1
+    UPLOAD_SYMBOL_FILES: 1
+    SYMBOL_TARGET: libMESA_handle_logger
     PULP3_REPO_NAME: framework-stable-x86_64.el7
     PULP3_DIST_NAME: framework-stable-x86_64.el7
   extends: .build_by_travis
@@ -88,58 +115,4 @@ release_build_release:
     paths:
       - build/*.rpm
   only:
-    - tags
-  except:
-    - /^v[0-9].*-testing$/i    
-
-release_build_release_devel:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    ENABLE_DEVEL_SWITCH: "ON"
-    PACKAGE: 1
-    UPLOAD: 1
-    PULP3_REPO_NAME: framework-stable-x86_64.el7
-    PULP3_DIST_NAME: framework-stable-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - tags
-  except:
-    - /^v[0-9].*-testing$/i    
-
-testing_build_release:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD: 1
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^v[0-9].*-testing$/i   
-
-testing_build_release_devel:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    ENABLE_DEVEL_SWITCH: "ON"
-    PACKAGE: 1
-    UPLOAD: 1
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^v[0-9].*-testing$/i  
+    - tags

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)
 
 
 

ci/travis.sh

@@ -33,7 +33,14 @@ env | sort
 : "${COMPILER_IS_GNUCXX:=OFF}"
 
 # Install dependency from YUM
-#yum install -y mrzcpd framework numactl-devel zlib-devel librdkafka-devel systemd-devel
+if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
+      yum install -y $INSTALL_DEPENDENCY_LIBRARY
+fi
+
+if [ $ASAN_OPTION ];then
+	source /opt/rh/devtoolset-7/enable
+fi
+
 mkdir build || true
 cd build
 
@@ -41,6 +48,8 @@ cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
       -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
       -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
       -DENABLE_DEVEL=$ENABLE_DEVEL_SWITCH \
+      -DASAN_OPTION=$ASAN_OPTION \
+      -DVERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \
       ..
 
 make
@@ -49,13 +58,14 @@ if [ -n "${PACKAGE}" ]; then
 	make package
 fi
 
-if [ -n "${UPLOAD}" ]; then	
+if [ -n "${UPLOAD_RPM}" ]; then	
 	cp ~/rpm_upload_tools.py ./
 	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
 fi
 
-#if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
-#  rpm -i tfe*debuginfo*.rpm
-#  cp /usr/lib/debug/opt/tsg/tfe/bin/tfe.debug /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-#  sentry-cli upload-dif -t elf /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-#fi
+if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
+	rpm -i $SYMBOL_TARGET*debuginfo*.rpm
+	_symbol_file=`find /usr/lib/debug/ -name "$SYMBOL_TARGET*.so*.debug"`
+	cp $_symbol_file ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
+	sentry-cli upload-dif -t elf ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
+fi

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)
         {
@@ -154,7 +156,7 @@ static void snapshot_handle_info(const char *handle_name, const char *log_path,
 
     if(g_zlog_inited == 0)
     {
-        printf("[snapshot_handle_info], Nobody call MESA_handle_runtime_log_creation before, Using (%s) to init zlog, handle_name(%s), log_path(%s), log_level(%d)!!!\n", tmp_conf_filepath, handle_name, log_path, level);
+        fprintf(stderr,"[snapshot_handle_info], Nobody call MESA_handle_runtime_log_creation before, Using (%s) to init zlog, handle_name(%s), log_path(%s), log_level(%d)!!!\n", tmp_conf_filepath, handle_name, log_path, level);
         zlog_init(tmp_conf_filepath);
         zlog_reload(NULL);
     }
@@ -191,7 +193,7 @@ void *MESA_create_runtime_log_handle(const char *file_path, int level)
     zc = zlog_get_category(p_name);
     if (!zc)
     {
-        printf("[MESA_create_runtime_log_handle], get zlog category (%s) in global_conf_filepath(%s) fail\n", p_name, global_conf_filepath);
+        fprintf(stderr,"[MESA_create_runtime_log_handle], get zlog category (%s) in global_conf_filepath(%s) fail\n", p_name, global_conf_filepath);
     }
     p_handle = (log_handle_t *)calloc(sizeof(log_handle_t), 1);
     strncpy(p_handle->runtime_log_file, file_path, sizeof(p_handle->runtime_log_file) - 1);
@@ -235,11 +237,11 @@ int MESA_handle_runtime_log_creation(const char *conf_path)
     int rc = 0;
     if (conf_path == NULL || (access(conf_path, R_OK) != 0))
     {
-        printf("[MESA_handle_runtime_log_creation],  PATH (%s) unable to access, will output log to STDOUT or Using ZLOG_CONF_PATH (%s) !\n", conf_path, env);
+        fprintf(stderr,"[MESA_handle_runtime_log_creation],  PATH (%s) unable to access, will output log to STDOUT or Using ZLOG_CONF_PATH (%s) !\n", conf_path, env);
         rc = zlog_init(NULL);
         if (rc)
         {
-            printf("[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed !!! \n", env);
+            fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed !!! \n", env);
             return -1;
         }
         else
@@ -255,11 +257,11 @@ int MESA_handle_runtime_log_creation(const char *conf_path)
         rc = zlog_init(conf_path);
         if (rc)
         {
-            printf("[MESA_handle_runtime_log_creation], INIT zlog by (%s) failed , using [NULL] retry !\n", conf_path);
+            fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (%s) failed , using [NULL] retry !\n", conf_path);
             rc = zlog_init(NULL);
             if (rc)
             {
-                printf("[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed \n", env);
+                fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed \n", env);
                 return -1;
             }
             else
@@ -277,7 +279,7 @@ int MESA_handle_runtime_log_creation(const char *conf_path)
         }
         
     }
-    printf("[MESA_handle_runtime_log_creation], INIT zlog finish, Using (%s). \n", global_conf_filepath);
+    fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog finish, Using (%s). \n", global_conf_filepath);
     g_zlog_inited = 1;
     zlog_profile();