Compare commits
24 Commits
v2.0.2-tes
...
v2.0.8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f76af2f036 | ||
|
|
31bd3fed9c | ||
|
|
9ecf746f0f | ||
|
|
040ce55a1b | ||
|
|
cb4ad71c50 | ||
|
|
02100e4232 | ||
|
|
63f5231e9f | ||
|
|
15fe685383 | ||
|
|
e1057e6d0c | ||
|
|
2e4e4dff17 | ||
|
|
150255033c | ||
|
|
0f0e55c877 | ||
|
|
8857f282b9 | ||
|
|
cc0912eed0 | ||
|
|
186571e823 | ||
|
|
e39e641103 | ||
|
|
f461cbbc3d | ||
|
|
05a8eded4b | ||
|
|
92815d2d1f | ||
|
|
ea4185727b | ||
|
|
7066b2b086 | ||
|
|
52db3f0001 | ||
|
|
7417fed852 | ||
|
|
0cb2236be0 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -11,7 +11,7 @@ build/
|
||||
core.*
|
||||
version.txt
|
||||
demo/test_handle_logger
|
||||
cmake-build-debug
|
||||
cmake-build-*
|
||||
build-*/
|
||||
GPATH
|
||||
GRTAGS
|
||||
|
||||
@@ -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
|
||||
@@ -14,7 +15,8 @@ stages:
|
||||
- cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
|
||||
- chmod +x ./ci/travis.sh
|
||||
script:
|
||||
- yum makecache
|
||||
- wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo
|
||||
- yum makecache fast
|
||||
- ./ci/travis.sh
|
||||
- cd build
|
||||
tags:
|
||||
@@ -48,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:
|
||||
@@ -63,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:
|
||||
@@ -73,12 +83,12 @@ develop_build_release:
|
||||
- /^master.*$/i
|
||||
|
||||
|
||||
release_build_release:
|
||||
release_build_debug:
|
||||
stage: build
|
||||
variables:
|
||||
BUILD_TYPE: RelWithDebInfo
|
||||
BUILD_TYPE: Debug
|
||||
PACKAGE: 1
|
||||
UPLOAD: 1
|
||||
UPLOAD_RPM: 1
|
||||
PULP3_REPO_NAME: framework-stable-x86_64.el7
|
||||
PULP3_DIST_NAME: framework-stable-x86_64.el7
|
||||
extends: .build_by_travis
|
||||
@@ -88,21 +98,21 @@ release_build_release:
|
||||
- build/*.rpm
|
||||
only:
|
||||
- tags
|
||||
except:
|
||||
- /^v[0-9].*-testing$/i
|
||||
|
||||
testing_build_release:
|
||||
release_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
|
||||
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
|
||||
artifacts:
|
||||
name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
|
||||
paths:
|
||||
- build/*.rpm
|
||||
only:
|
||||
- /^v[0-9].*-testing$/i
|
||||
- tags
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required (VERSION 2.8)
|
||||
|
||||
set(lib_name MESA_handle_logger2)
|
||||
set(lib_name MESA_handle_logger)
|
||||
|
||||
project (${lib_name})
|
||||
|
||||
@@ -37,9 +37,10 @@ add_subdirectory(zlog)
|
||||
|
||||
# Shared Library Output
|
||||
add_library(${lib_name}_shared SHARED src/MESA_handle_logger.c)
|
||||
target_link_libraries(${lib_name}_shared zlog_shared)
|
||||
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")
|
||||
target_link_libraries(${lib_name}_shared pthread)
|
||||
|
||||
if(DEFINED MESA_SHARED_INSTALL_DIR)
|
||||
set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name} LIBRARY_OUTPUT_DIRECTORY ${MESA_SHARED_INSTALL_DIR})
|
||||
@@ -52,7 +53,7 @@ set_target_properties(${lib_name}_shared PROPERTIES SOVERSION ${LIB_MAJOR_VERSIO
|
||||
|
||||
# static Library Output
|
||||
add_library(${lib_name}_static STATIC src/MESA_handle_logger.c)
|
||||
target_link_libraries(${lib_name}_static zlog_shared)
|
||||
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)
|
||||
@@ -61,18 +62,11 @@ 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 \
|
||||
)"
|
||||
)
|
||||
|
||||
install(FILES conf/MESA_handle_logger.conf DESTINATION /usr/lib/tmpfiles.d/ COMPONENT PROFILE)
|
||||
|
||||
|
||||
|
||||
add_executable(${lib_name}_demo demo/test_handle_logger.c)
|
||||
target_link_libraries(${lib_name}_demo rt pthread ${lib_name}_static)
|
||||
target_link_libraries(${lib_name}_demo pthread ${lib_name}_shared)
|
||||
|
||||
include(Package)
|
||||
|
||||
24
ci/travis.sh
24
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
|
||||
@@ -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)
|
||||
|
||||
@@ -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}
|
||||
@@ -38,16 +38,12 @@ set(VERSION_BUILD "${VCS_SHORT_HASH}")
|
||||
# print information
|
||||
message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
|
||||
|
||||
if(NOT DEFINE_GIT_VERSION)
|
||||
option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF)
|
||||
|
||||
set(GIT_VERSION
|
||||
"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
|
||||
string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
|
||||
option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to TRUE or FALSE" TRUE)
|
||||
|
||||
if(DEFINE_GIT_VERSION)
|
||||
add_definitions(-DGIT_VERSION=${GIT_VERSION})
|
||||
option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON)
|
||||
endif()
|
||||
set(GIT_VERSION
|
||||
"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
|
||||
string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
|
||||
|
||||
add_definitions(-DGIT_VERSION=${GIT_VERSION})
|
||||
endif()
|
||||
|
||||
4
cmake/changelog.sh
Normal file
4
cmake/changelog.sh
Normal file
@@ -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
|
||||
2
conf/MESA_handle_logger.conf
Normal file
2
conf/MESA_handle_logger.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
#Type Path Mode User Group Age Argument
|
||||
d /tmp/MESA_handle_logger/ 0755 - - 1h -
|
||||
@@ -1,9 +1,10 @@
|
||||
#include "MESA_handle_logger.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <pthread.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
void *sample_handle = NULL;
|
||||
@@ -12,6 +13,7 @@ void *test_handle = NULL;
|
||||
#define LOG_NUM 100000
|
||||
#define MAX_THREAD_NUM 65535
|
||||
|
||||
int g_mode = 0;
|
||||
int g_log_num = 0;
|
||||
int g_thread_num = 0;
|
||||
const char *g_zlog_conf = NULL;
|
||||
@@ -80,7 +82,10 @@ void sig_int_handler(int sig)
|
||||
MESA_destroy_runtime_log_handle(test_handle);
|
||||
sample_handle = NULL;
|
||||
test_handle = NULL;
|
||||
if (g_mode == 2)
|
||||
{
|
||||
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);
|
||||
}
|
||||
@@ -96,25 +101,29 @@ int main(int argc, char ** args)
|
||||
pthread_t t[MAX_THREAD_NUM];
|
||||
int i = 0;
|
||||
|
||||
if(argc != 4)
|
||||
if (argc != 5)
|
||||
{
|
||||
printf("Usage: ./($app) $zlog_conf_path $thread_num $log_num \n");
|
||||
printf("Usage: ./($app) $mode[1 or 2] $zlog_conf_path $thread_num $log_num \n");
|
||||
return -1;
|
||||
}
|
||||
g_zlog_conf = args[1];
|
||||
g_thread_num = atoi(args[2]);
|
||||
g_log_num = atoi(args[3]);
|
||||
g_mode = atoi(args[1]);
|
||||
g_zlog_conf = args[2];
|
||||
g_thread_num = atoi(args[3]);
|
||||
g_log_num = atoi(args[4]);
|
||||
|
||||
if(g_thread_num <= 0 || g_log_num <= 0)
|
||||
{
|
||||
printf("Error, wrong parameter!\n");
|
||||
return -1;
|
||||
}
|
||||
if(0 != MESA_handle_runtime_log_creation(g_zlog_conf))
|
||||
if (g_mode == 2)
|
||||
{
|
||||
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)
|
||||
{
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <time.h>
|
||||
|
||||
#define MAX_HANDLE_LOG_PATH 4096
|
||||
static int g_zlog_inited = 0;
|
||||
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] = "";
|
||||
@@ -93,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)
|
||||
{
|
||||
@@ -116,13 +116,26 @@ static void escape_for_zlog(char *in_buf, int buflen)
|
||||
return;
|
||||
}
|
||||
|
||||
static const char *loglevel_to_name(int level)
|
||||
{
|
||||
if (level <= RLOG_LV_DEBUG)
|
||||
return "DEBUG";
|
||||
if (level > RLOG_LV_DEBUG && level <= RLOG_LV_INFO)
|
||||
return "INFO";
|
||||
return "FATAL";
|
||||
}
|
||||
|
||||
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];
|
||||
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)
|
||||
{
|
||||
@@ -132,16 +145,21 @@ static void snapshot_handle_info(const char *handle_name, const char *log_path,
|
||||
{
|
||||
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));
|
||||
write(g_zlog_conf_fp, zlog_conf_init_buff, strlen(zlog_conf_init_buff));
|
||||
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);
|
||||
"\n%s.%s \"%s.%%d(%%F)\"",
|
||||
handle_name, loglevel_to_name(level), log_path);
|
||||
write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
|
||||
fsync(g_zlog_conf_fp);
|
||||
|
||||
if(g_zlog_inited == 0)
|
||||
{
|
||||
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);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -157,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);
|
||||
@@ -165,15 +182,18 @@ void *MESA_create_runtime_log_handle(const char *file_path, int level)
|
||||
p_name = handle_name;
|
||||
|
||||
|
||||
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)
|
||||
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);
|
||||
if (!zc)
|
||||
{
|
||||
printf("get zlog category %s in %s fail\n", p_name, tmp_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);
|
||||
@@ -213,33 +233,59 @@ void MESA_handle_runtime_log(void *handle, int level, const char *module, const
|
||||
|
||||
int MESA_handle_runtime_log_creation(const char *conf_path)
|
||||
{
|
||||
if(conf_path == NULL)
|
||||
char *env = getenv("ZLOG_CONF_PATH");
|
||||
int rc = 0;
|
||||
if (conf_path == NULL || (access(conf_path, R_OK) != 0))
|
||||
{
|
||||
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);
|
||||
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("init zlog by %s failed\n", conf_path);
|
||||
fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed !!! \n", env);
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
strcpy(global_conf_filepath, conf_path);
|
||||
zlog_profile();
|
||||
if (env != NULL)
|
||||
{
|
||||
strcpy(global_conf_filepath, env);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
rc = zlog_init(conf_path);
|
||||
if (rc)
|
||||
{
|
||||
fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (%s) failed , using [NULL] retry !\n", conf_path);
|
||||
rc = zlog_init(NULL);
|
||||
if (rc)
|
||||
{
|
||||
fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed \n", env);
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(env != NULL)
|
||||
{
|
||||
strcpy(global_conf_filepath, env);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
strcpy(global_conf_filepath, conf_path);
|
||||
}
|
||||
|
||||
}
|
||||
fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog finish, Using (%s). \n", global_conf_filepath);
|
||||
g_zlog_inited = 1;
|
||||
zlog_profile();
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int MESA_handle_runtime_log_reconstruction(const char *conf_path)
|
||||
{
|
||||
int rc = zlog_reload(conf_path);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
global: MESA*runtime_log*;
|
||||
global: MESA*runtime_log*;GIT_VERSION_*;
|
||||
local: *;
|
||||
};
|
||||
@@ -4,7 +4,7 @@ include(ExternalProject)
|
||||
|
||||
ExternalProject_Add(zlog PREFIX zlog
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/zlog-1.2.15.tar.gz
|
||||
URL_MD5 155f841543f947bf21112ae4328e7152
|
||||
URL_MD5 5e79f8d08744c7fef8528dd55a3bcd2d
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND make
|
||||
INSTALL_COMMAND ""
|
||||
@@ -14,10 +14,15 @@ 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)
|
||||
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(PROGRAMS ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE)
|
||||
install(FILES ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE)
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user