ci中tyum makecache增加fast参数

Conflicts:
	CMakeLists.txt

.gitignore

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

.gitlab-ci.yml

@@ -14,7 +14,7 @@ stages:
   - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
   - chmod +x ./ci/travis.sh
   script:
-  - yum makecache
+  - yum makecache fast
   - ./ci/travis.sh
   - cd build
   tags:
@@ -26,7 +26,8 @@ branch_build_debug:
   variables:
     BUILD_TYPE: Debug
   except:
-    - /^develop.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
     - /^master.*$/i
     - tags
 
@@ -36,7 +37,8 @@ branch_build_release:
     BUILD_TYPE: RelWithDebInfo
   extends: .build_by_travis
   except:
-    - /^develop.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
     - /^master.*$/i
     - tags
 
@@ -51,7 +53,8 @@ develop_build_debug:
     paths:
       - build/*.rpm
   only:
-    - /^develop.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
     - /^master.*$/i
 
 develop_build_release:
@@ -65,7 +68,8 @@ develop_build_release:
     paths:
       - build/*.rpm
   only:
-    - /^develop.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
     - /^master.*$/i
 
 
@@ -84,3 +88,21 @@ release_build_release:
       - 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   

CMakeLists.txt

@@ -1,48 +1,46 @@
 cmake_minimum_required (VERSION 2.8)
 
-set(lib_name MESA_handle_logger)
+set(lib_name MESA_handle_logger2)
 
 project (${lib_name})
 
-set(LIB_MAJOR_VERSION 1)
-set(LIB_MINOR_VERSION 1)
+set(LIB_MAJOR_VERSION 2)
+set(LIB_MINOR_VERSION 0)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(Version)
 
-#SET(CMAKE_C_COMPILER "/usr/bin/g++")
 set(CMAKE_MACOSX_RPATH 0)
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
 
 #for ASAN
-set(ASAN_OPTION "OFF" CACHE STRING " set asan type chosen by the user, using OFF as default")
-set_property(CACHE ASAN_OPTION  PROPERTY STRINGS OFF ADDRESS THREAD)
-message(STATUS "ASAN_OPTION='${ASAN_OPTION}'")
+option(ENABLE_SANITIZE_ADDRESS "Enable AddressSanitizer" FALSE)
+option(ENABLE_SANITIZE_THREAD "Enable ThreadSanitizer" FALSE)
 
-if(ASAN_OPTION MATCHES "ADDRESS")
-    set(CMAKE_C_FLAGS "${CMAKADDRESS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=address -fno-omit-frame-pointer")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=address -fno-omit-frame-pointer")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
-	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
-elseif(ASAN_OPTION MATCHES "THREAD")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=thread -fno-omit-frame-pointer")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=thread -fno-omit-frame-pointer")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
-	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+if(ENABLE_SANITIZE_ADDRESS)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+elseif(ENABLE_SANITIZE_THREAD)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan")
 endif()
 # end of for ASAN
 
 include_directories(${PROJECT_SOURCE_DIR}/inc/)
 
-file(GLOB SRC
-    "src/*.c"
-    "src/*.cpp"
-)
-
+add_subdirectory(zlog)
 
 # Shared Library Output
-add_library(${lib_name}_shared SHARED ${SRC})
+add_library(${lib_name}_shared SHARED src/MESA_handle_logger.c)
+target_link_libraries(${lib_name}_shared  zlog_static)
+set_target_properties(${lib_name}_shared PROPERTIES LINK_FLAGS
+    "-Wl,--version-script=${PROJECT_SOURCE_DIR}/src/version.map")
+
 if(DEFINED MESA_SHARED_INSTALL_DIR)
 	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name} LIBRARY_OUTPUT_DIRECTORY ${MESA_SHARED_INSTALL_DIR})
 else()
@@ -52,24 +50,29 @@ endif()
 set_target_properties(${lib_name}_shared PROPERTIES VERSION ${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION})
 set_target_properties(${lib_name}_shared PROPERTIES SOVERSION ${LIB_MAJOR_VERSION})
 
-
 # static Library Output
-add_library(${lib_name}_static STATIC ${SRC})
+add_library(${lib_name}_static STATIC src/MESA_handle_logger.c)
+target_link_libraries(${lib_name}_static  zlog_static)
 set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name})
 
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
 
-install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
-install(FILES inc/${lib_name}.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
+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(CODE "execute_process( \
+    COMMAND ${CMAKE_COMMAND} -E create_symlink \
+    libMESA_handle_logger2.so \
+    ${CMAKE_INSTALL_PREFIX}/lib/libMESA_handle_logger.so  \
+    )"
+)    
+    
 
 
 
-file(GLOB DEMO
-    "demo/*.c"
-    "demo/*.cpp"
-)
-
-add_executable(${lib_name}_demo ${DEMO})
+add_executable(${lib_name}_demo demo/test_handle_logger.c)
 target_link_libraries(${lib_name}_demo  rt pthread ${lib_name}_static)
 
 include(Package)

README

@@ -4,13 +4,19 @@
  *Author:yangwei@iie.ac.cn
  *History:
 		2014-03-24 created by yw
-		1)first version
+		1)第一个动态库版本
 		
 		2014-04-16 modified by yw
-		1)strict inspection parameters, compatible with g++ 4.4.4
+		1) 支持g++ 4.4.4编译
 		
 		2014-05-29 update by yw
-		1)create  directory is supported
+		1)支持创建用户指定的日志目录
+
+		2019-2-18 update by yw
+		1)性能优化，句柄中存储文件fp，定期flush至文件
+
+		2020-09-07 update to libMESA_handle_logger2 by yw
+		1)内部使用zlog实现，行为变更，更新库为libMESA_handle_logger2
 ------------------------------------------------------------------------------------- 		
  NOTICE:
 		1)compatible with g++, extern with c;

cmake/Package.cmake

@@ -26,24 +26,27 @@ set(CPACK_RPM_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
 set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
 set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
-set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE)
+set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
 set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
 set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
-set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
 
-set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_COMPONENT_LIBRARY_GROUP "library")
+set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+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_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")
 set(CPACK_COMPONENT_HEADER_GROUP "header")
 
-set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})
+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 LIBRARY HEADER)
+set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE)
 
+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)
 
 set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
 

cmake/PostInstall.in

@@ -0,0 +1,2 @@
+#!/bin/sh
+ldconfig

demo/demo_zlog.conf

@@ -0,0 +1,13 @@
+[global]
+default format = "%d(%c), %V, %U, %m%n"
+[levels]
+DEBUG=10
+INFO=20
+FATAL=30
+[formats]
+other = "%d(%c), %V, %F, %U, %m%n"
+[rules]
+*.=debug    "./log/runtimelog_debug.%d(%F)"
+*.=info    "./log/runtimelog_info.%d(%F)"
+*.=fatal    "./log/runtimelog_fatal.%d(%F)"
+!.*    "./log/runtimelog_other.%d(%F)"; other

demo/test_handle_logger.c

@@ -14,6 +14,7 @@ void *test_handle = NULL;
 
 int g_log_num = 0;
 int g_thread_num = 0;
+const char *g_zlog_conf = NULL;
 volatile long g_start_time = 0;
 volatile long g_end_time = 0;
 
@@ -37,11 +38,11 @@ void call_logger(int log_num, int thread_num)
 		}	
 		for(i = 0; i < log_num; i++)
 		{
-				MESA_handle_runtime_log(sample_handle, RLOG_LV_INFO, "sample", "sample_handle MESA_handle_runtime_log, i = %d, thread_num = %d", i, thread_num);
+				MESA_handle_runtime_log(sample_handle, RLOG_LV_DEBUG, "sample", "sample_handle MESA_handle_runtime_log, i = %d, thread_num = %d", i, thread_num);
 				//sleep(1);
 				MESA_handle_runtime_log(test_handle, RLOG_LV_INFO, "test", "test_handle MESA_handle_runtime_log, i = %d, thread_num = %d", i, thread_num);
 				//MESA_HANDLE_RUNTIME_LOG(sample_handle, RLOG_LV_FATAL, "sample", "sample_handle RUNTIEM_LOG test, i = %d, thread_num = %d", i, thread_num);
-				////sleep(1);
+				//sleep(1);
 				//MESA_HANDLE_RUNTIME_LOG(test_handle, RLOG_LV_FATAL, "test", "test_handle RUNTIEM_LOG test, i = %d, thread_num = %d", i, thread_num);
 		}
 		clock_gettime(CLOCK_MONOTONIC, &end);
@@ -72,36 +73,49 @@ void *thread_logger(void *arg)
 		return NULL;
 }
 
-void sig_handler(int sig)
+void sig_int_handler(int sig)
 {
 		printf("ctrl+c recviced!\n");
 		MESA_destroy_runtime_log_handle(sample_handle);
 		MESA_destroy_runtime_log_handle(test_handle);
 		sample_handle = NULL;
 		test_handle = NULL;
-		printf("%d thread write %d log using %ld us, avg speed %f /s, %ld -> %ld\n", g_thread_num, g_thread_num*g_log_num, g_end_time-g_start_time, ((float)(g_thread_num*g_log_num)/(float)(g_end_time-g_start_time))*1000000, g_start_time, g_end_time);
+		MESA_handle_runtime_log_destruction();
+		printf("%d thread write %d log using %ld us, avg speed %f /s, %ld -> %ld\n", g_thread_num, g_thread_num * g_log_num, g_end_time - g_start_time, ((float)(g_thread_num * g_log_num) / (float)(g_end_time - g_start_time)) * 1000000, g_start_time, g_end_time);
 		exit(0);
 }
 
+void sig_hup_handler(int sig)
+{
+	printf("SIGHUP recviced!\n");
+	MESA_handle_runtime_log_reconstruction(g_zlog_conf);
+}
+
 int main(int argc, char ** args)
 {
 	pthread_t t[MAX_THREAD_NUM];
 	int i = 0;
 
-	if(argc != 3)
+	if(argc != 4)
 	{
-		printf("Usage: ./($app) $thread_num $log_num \n");
+		printf("Usage: ./($app) $zlog_conf_path $thread_num $log_num \n");
 		return -1;
 	}
-	g_thread_num = atoi(args[1]);
-	g_log_num = atoi(args[2]);
+    g_zlog_conf = args[1];
+	g_thread_num = atoi(args[2]);
+	g_log_num = atoi(args[3]);
 
 	if(g_thread_num <= 0 || g_log_num <= 0)
 	{
 		printf("Error, wrong parameter!\n");
 		return -1;
 	}
-	sample_handle = MESA_create_runtime_log_handle("./log/test_log", RLOG_LV_DEBUG);
+	if(0 != MESA_handle_runtime_log_creation(g_zlog_conf))
+	{
+		printf("MESA_handle_runtime_log_creation return error\n");
+		return -1;
+	}
+	sample_handle = MESA_create_runtime_log_handle("./log/sample_log", RLOG_LV_DEBUG);
 	if (sample_handle == NULL)
 	{
 		printf("get log sample_handle error\n");
@@ -119,7 +133,8 @@ int main(int argc, char ** args)
 		{	
 				pthread_create(&t[i], NULL, thread_logger, (void *)(unsigned long)(i));
 		}
-		signal(SIGINT, sig_handler);
+		signal(SIGINT, sig_int_handler);
+		signal(SIGHUP, sig_hup_handler);
 		while(1)
 		;
 		//MESA_destroy_runtime_log_handle(sample_handle);

inc/MESA_handle_logger.h

@@ -19,11 +19,15 @@ extern "C"
 #define RLOG_LV_FATAL       30
 
 
+int MESA_handle_runtime_log_creation(const char *conf_path);
+int MESA_handle_runtime_log_reconstruction(const char *conf_path);
+void MESA_handle_runtime_log_destruction();
+
 #define MESA_HANDLE_RUNTIME_LOG(handle, lv, mod, fmt, args...)   \
     MESA_handle_runtime_log((handle), (lv), (mod), "file %s, line %d, " fmt, \
                        __FILE__, __LINE__, ##args)
 
-/*
+    /*
  * name: MESA_create_runtime_log_handle
  * functionality: get runtime_log handle;
  * params:
@@ -33,7 +37,7 @@ extern "C"
  *  not NULL, if succeeded;
  *   NULL, if file is not absolute path, or failed to create log file;
  */
-void *MESA_create_runtime_log_handle(const char *file_path, int level);
+    void *MESA_create_runtime_log_handle(const char *file_path, int level);
 
 /*
  * name: MESA_handle_runtime_log

src/MESA_handle_logger.c

@@ -1,23 +1,24 @@
 #include "MESA_handle_logger.h"
+#include "zlog.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <fcntl.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
-#include<sys/stat.h>
+#include <time.h>
+
+#define MAX_HANDLE_LOG_PATH 4096
+static int g_zlog_conf_fp = -1;
+static char global_conf_filepath[MAX_HANDLE_LOG_PATH] = "";
+static char tmp_conf_filepath[MAX_HANDLE_LOG_PATH] = "";
 
-int LOGMSG_MAX_LEN = 4096;
-int FLUSH_LOG_NUM = 0;
 typedef struct log_handle_t
 {
     int runtime_log_level;
-    int flush_log_count;
-    FILE *fp;
-    pthread_mutex_t mutex;
-    char runtime_log_file[1200];
-    char cur_log_file[4096];
+    zlog_category_t *zc;
+    const char *global_conf_path;
+    char runtime_log_file[MAX_HANDLE_LOG_PATH];
 } log_handle_t;
 
 
@@ -46,12 +47,6 @@ static __attribute__((__used__)) const char * GIT_VERSION_UNKNOWN = NULL;
 #endif
 
 
-static unsigned char weekday_str[7][4] =
-{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-
-static unsigned char month_str[12][4] = {"Jan", "Feb", "Mar", "Apr",
-	"May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
 static int create_dir(const char *dir_path, int path_len)
 {
     if(dir_path == NULL)
@@ -94,41 +89,96 @@ static int create_path(const char *path, int path_len)
     return 0;
 }
 
+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 void escape_for_zlog(char *in_buf, int buflen)
+{
+    if(in_buf == NULL || buflen <= 0)return;
+    int i = 0;
+    for(i = 0; i < buflen; i++)
+    {
+        if ((!isalnum(in_buf[i])) && (in_buf[i] != '_') && (in_buf[i] != '-') && (in_buf[i] != '*') && (in_buf[i] != '!'))
+        {
+            in_buf[i] = '_';
+        }
+    }
+    return;
+}
+
+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];
+    if (g_zlog_conf_fp == -1)
+    {
+        char temp_filename[1024] = "";
+        sprintf(temp_filename, "/tmp/MESA_handle_logger_%d.XXXXXX", getpid());
+        g_zlog_conf_fp = mkstemp(temp_filename);
+        if (g_zlog_conf_fp == -1)
+        {
+            return ;
+        }
+        if (get_filepath(g_zlog_conf_fp, tmp_conf_filepath, sizeof(tmp_conf_filepath)) < 0)
+        {
+            return;
+        }
+        int len = snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
+                           "[global]\ndefault format = \"%%d(%%c), %%V, %F, %U, %%m%%n\" \n[levels]\nDEBUG=10\nINFO=20\nFATAL=30\n[rules]");
+        write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
+        fsync(g_zlog_conf_fp);
+    }
+    snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
+             "\n%s.%d    \"%s.%%d(%%F)\"",
+             handle_name, level, log_path);
+    write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
+    fsync(g_zlog_conf_fp);
+    return;
+}
+
 void *MESA_create_runtime_log_handle(const char *file_path, int level)
 {
 	if(file_path == NULL)
 		return NULL;
-    char *max_len = getenv("HLOG_MSG_SIZE");
-    char *flush_num = getenv("HLOG_FLUSH_NUM");
 
-    if(max_len != NULL)LOGMSG_MAX_LEN = atoi(max_len);
-    if(flush_num != NULL)FLUSH_LOG_NUM = atoi(flush_num);
-    
+    int rc = -1;
+    zlog_category_t *zc = NULL;
     FILE *fp  = NULL;
     log_handle_t *p_handle = NULL;
 
+    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);
+    escape_for_zlog(handle_name, strlen(handle_name));
+    p_name = handle_name;
+
+
     //creating file_path failed, return NULL
-	char *p_path = rindex(file_path, '/');
-	if(p_path != 0)
-	{
-		if(create_path(file_path, p_path - file_path) < 0)
-			return NULL;
-	}
-    if(NULL == (fp = fopen(file_path, "w")))
-		return NULL;
+    if (create_path(file_path, p_path_end - file_path) < 0)
+        return NULL;
 
-    //fclose(fp);
-    //remove(file_path);
+    snapshot_handle_info(p_name, file_path, level);
+    zc = zlog_get_category(p_name);
+    if (!zc)
+    {
+        printf("get zlog category %s in %s fail\n", p_name, tmp_conf_filepath);
+    }
     p_handle = (log_handle_t *)calloc(sizeof(log_handle_t), 1);
-
-    if(p_handle == NULL)
-		return NULL;
-
-    strncpy(p_handle->runtime_log_file, file_path, 1024);
-    p_handle->runtime_log_file[1024] = '\0';
+    strncpy(p_handle->runtime_log_file, file_path, sizeof(p_handle->runtime_log_file) - 1);
     p_handle->runtime_log_level = level;
-    pthread_mutex_init(&p_handle->mutex,NULL);
-    //p_handle->fp = fp;
+    p_handle->zc = zc;
     return (void *)p_handle;
 }
 
@@ -136,132 +186,99 @@ void MESA_destroy_runtime_log_handle(void *handle)
 {
     if(handle != NULL)
     {
-        log_handle_t *p_handle = (log_handle_t *)handle;
-        if (p_handle->fp != NULL)
-        {
-            fclose(p_handle->fp);
-            p_handle->fp = NULL;
-        }
-            free(handle);
+        free(handle);
         handle = NULL;
     }
 
     return;
 }
 
-static void MESA_handle_close_file(log_handle_t *p_handle)
-{
-	pthread_mutex_lock(&p_handle->mutex); 
-	if(p_handle->fp != NULL)
-	{
-		fclose(p_handle->fp);
-		p_handle->fp = NULL;
-	}
-	pthread_mutex_unlock(&p_handle->mutex); 
-	return;	
-}
-
-static int MESA_handle_open_file(char *file_name, log_handle_t *p_handle)
-{
-	FILE *fp = NULL;
-	MESA_handle_close_file(p_handle);
-	if(NULL == (fp = fopen(file_name, "a"))) 
-	{
-		return -1;
-	}
-        p_handle->fp = fp;
-        p_handle->flush_log_count = 0;
-        memcpy(p_handle->cur_log_file, file_name, strlen(file_name));
-	return 0;
-}
 
 void MESA_handle_runtime_log(void *handle, int level, const char *module, const char *fmt, ...)
 {
-    char buf[LOGMSG_MAX_LEN + 1];
-    time_t t;
-    int len;
-    va_list ap;
-    FILE *fp;
-    struct tm local_time;
-    char tmp_log_file_name[1400];
+    
     log_handle_t *p_handle = (log_handle_t *)handle;
 
     if(p_handle == NULL || p_handle->runtime_log_file == NULL)return;
 
-    if(level < p_handle->runtime_log_level) return;
-
-    time(&t);
-    if(NULL == (localtime_r(&t, &local_time))) return;
-    len = snprintf(buf, sizeof(buf), "%s %s %d %02d:%02d:%02d %d", weekday_str[local_time.tm_wday],
-             month_str[local_time.tm_mon], local_time.tm_mday, local_time.tm_hour, local_time.tm_min, local_time.tm_sec, local_time.tm_year+1900);
-    //len = strlen(buf);
-
-    switch(level)
-    {
-        case RLOG_LV_DEBUG:
-            len += snprintf(buf + len,
-                            LOGMSG_MAX_LEN - len, ", %s, ", "DEBUG");
-            break;
-
-        case RLOG_LV_INFO:
-            len += snprintf(buf + len,
-                            LOGMSG_MAX_LEN - len, ", %s, ", "INFO");
-            break;
-
-        case RLOG_LV_FATAL:
-            len += snprintf(buf + len,
-                            LOGMSG_MAX_LEN - len, ", %s, ", "FATAL");
-            break;
-
-        default:
-            len += snprintf(buf + len,
-                            LOGMSG_MAX_LEN - len, ", %s, ", "UNKNOWN");
-            break;
-    }
-
-    if(0 >= LOGMSG_MAX_LEN - len) return;
-
-    len += snprintf(buf + len, LOGMSG_MAX_LEN - len, "%s, ", module);
-
-    if(0 >= LOGMSG_MAX_LEN - len) return;
+    if(p_handle->zc == NULL)return;
 
+    va_list ap;
     va_start(ap, fmt);
-    len += vsnprintf(buf + len, LOGMSG_MAX_LEN - len, fmt, ap);
+    vzlog(p_handle->zc, p_handle->runtime_log_file, strlen(p_handle->runtime_log_file), module, strlen(module), __LINE__, level, fmt, ap);
     va_end(ap);
-
-    if(0 >= LOGMSG_MAX_LEN - len) return;
-
-    len += snprintf(buf + len, LOGMSG_MAX_LEN - len, "\n");
-
-
-    sprintf(tmp_log_file_name, "%s.%04d-%02d-%02d", p_handle->runtime_log_file,
-            local_time.tm_year + 1900, local_time.tm_mon + 1,
-            local_time.tm_mday);
-
-    if(p_handle->fp == NULL)
-    {
-	    if(0 != MESA_handle_open_file(tmp_log_file_name,p_handle))return;
-    }
-    else
-    {
-	    if (0 != memcmp(tmp_log_file_name, p_handle->cur_log_file, strlen(tmp_log_file_name)))
-	    {
-		    if(0 != MESA_handle_open_file(tmp_log_file_name,p_handle))return;
-	    }
-    }
-    if (0 > fprintf(p_handle->fp, "%s", buf))
-    {
-	MESA_handle_close_file(p_handle);
-    }
-    else
-    {
-	    p_handle->flush_log_count+=1;
-	    if (p_handle->flush_log_count >= FLUSH_LOG_NUM)
-	    {
-		    fflush(p_handle->fp);
-		    p_handle->flush_log_count = 0;
-	    }
-    }        
-    return;
+    return ;
 }
 
+
+int MESA_handle_runtime_log_creation(const char *conf_path)
+{
+    if(conf_path == NULL)
+    {
+        printf("MESA_handle_runtime_log_creationUsing NULL, will using ZLOG_CONF_PATH or strout as default profile\n");
+        return zlog_init(NULL); 
+    }
+
+    if (access(conf_path, R_OK) != -1)
+    {
+
+        int rc = zlog_init(conf_path);
+        if (rc)
+        {
+                printf("init zlog by %s failed\n", conf_path);
+                return -1;
+        }
+        else
+        {
+            strcpy(global_conf_filepath, conf_path);
+            zlog_profile();
+        }
+        return rc;
+    }
+    return -1;
+}
+
+
+
+int MESA_handle_runtime_log_reconstruction(const char *conf_path)
+{
+    int rc = zlog_reload(conf_path);
+ #ifdef DEBUG
+    char zlog_rule_conf_content[MAX_HANDLE_LOG_PATH + 1];
+    time_t t;
+    struct tm local_time;
+    static unsigned char weekday_str[7][4] =
+        {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+
+    static unsigned char month_str[12][4] = {"Jan", "Feb", "Mar", "Apr",
+                                             "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+    if (!rc)
+    {
+        strcpy(global_conf_filepath, conf_path);
+        zlog_profile();
+        if (g_zlog_conf_fp != -1)
+        {
+            time(&t);
+            if (NULL != (localtime_r(&t, &local_time)))
+            {
+                snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
+                         "\n%s %s %d %02d:%02d:%02d %d, RECONSTRUCTION to %s\n", weekday_str[local_time.tm_wday],
+                         month_str[local_time.tm_mon], local_time.tm_mday, local_time.tm_hour, local_time.tm_min, local_time.tm_sec, local_time.tm_year + 1900, conf_path);
+                write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
+                fsync(g_zlog_conf_fp);
+            }
+        }
+    }
+#endif        
+        return rc;
+}
+
+void MESA_handle_runtime_log_destruction()
+{
+    zlog_fini();
+    if (g_zlog_conf_fp != -1)
+    {
+        unlink(tmp_conf_filepath);
+        close(g_zlog_conf_fp);
+    }
+}

src/version.map

@@ -0,0 +1,4 @@
+{
+  global: MESA*runtime_log*;
+  local: *;
+};

zlog/CMakeLists.txt

@@ -0,0 +1,28 @@
+cmake_minimum_required (VERSION 3.5)
+
+include(ExternalProject)
+
+ExternalProject_Add(zlog PREFIX zlog
+	URL ${CMAKE_CURRENT_SOURCE_DIR}/zlog-1.2.15.tar.gz
+    URL_MD5 155f841543f947bf21112ae4328e7152 
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND make
+    INSTALL_COMMAND ""
+	BUILD_IN_SOURCE 1)
+
+ExternalProject_Get_Property(zlog SOURCE_DIR)
+file(MAKE_DIRECTORY ${SOURCE_DIR}/src/)
+
+
+add_library(zlog_static STATIC IMPORTED GLOBAL)
+add_dependencies(zlog_static  zlog)
+set_property(TARGET zlog_static  PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.a)
+set_property(TARGET zlog_static  PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src)
+
+add_library(zlog_shared SHARED IMPORTED GLOBAL)
+add_dependencies(zlog_shared  zlog)
+set_property(TARGET zlog_shared  PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.so.1.2)
+set_property(TARGET zlog_shared  PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src)
+
+install(FILES ${SOURCE_DIR}/src/libzlog.so.1.2 DESTINATION lib COMPONENT LIBRARIES)
+install(FILES ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE)