gfwleak/mesa-framework-mesa-handle-logger
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPDATE: snapshot中rules路径使用原始输入的file_path；日志中__FILE__字段使用创建handle时输入的file_path

Browse Source
This commit is contained in:
yangwei
2020-09-08 18:20:14 +08:00
parent 90fb91cd42
commit b4f239ae9c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/demo_zlog.conf
View File

@@ -1,5 +1,5 @@
[global] [global]
default format = "%d(%c), %V, %U, %m%n" default format = "%d(%c), %V, %F, %U, %m%n"
[levels] [levels]
DEBUG=10 DEBUG=10
INFO=20 INFO=20

10
src/MESA_handle_logger.c
View File

@@ -116,7 +116,7 @@ static void escape_for_zlog(char *in_buf, int buflen)
return; return;
} }
static void snapshot_handle_info(const char *handle_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]; char zlog_rule_conf_content[MAX_HANDLE_LOG_PATH + 1];
if (g_zlog_conf_fp == -1) if (g_zlog_conf_fp == -1)
@@ -133,13 +133,13 @@ static void snapshot_handle_info(const char *handle_name, int level)
return; return;
} }
int len = snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content), int len = snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
"[global]\ndefault format = \"%%d(%%c), %%V, %U, %%m%%n\" \n[levels]\nDEBUG=10\nINFO=20\nFATAL=30\n[rules]"); "[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_rule_conf_content, strlen(zlog_rule_conf_content));
fsync(g_zlog_conf_fp); fsync(g_zlog_conf_fp);
} }
snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content), snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
"\n%s.%d \"%s.%%d(%%F)\"", "\n%s.%d \"%s.%%d(%%F)\"",
handle_name, level, handle_name); handle_name, level, log_path);
write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content)); write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
fsync(g_zlog_conf_fp); fsync(g_zlog_conf_fp);
return; return;
@@ -169,7 +169,7 @@ void *MESA_create_runtime_log_handle(const char *file_path, int level)
if (create_path(file_path, p_path_end - file_path) < 0) if (create_path(file_path, p_path_end - file_path) < 0)
return NULL; return NULL;
snapshot_handle_info(p_name, level); snapshot_handle_info(p_name, file_path, level);
zc = zlog_get_category(p_name); zc = zlog_get_category(p_name);
if (!zc) if (!zc)
{ {
@@ -205,7 +205,7 @@ void MESA_handle_runtime_log(void *handle, int level, const char *module, const
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vzlog(p_handle->zc, __FILE__, sizeof(__FILE__) - 1, module, strlen(module), __LINE__, level, 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); va_end(ap);
return ; return ;
} }