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

更新reconstruction流程，对conf_path的判断交由zlog内部完成

Browse Source
This commit is contained in:
yangwei
2020-09-07 19:49:21 +08:00
parent 40512a0421
commit 2e4c2d3098
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/MESA_handle_logger.c
View File

@@ -242,39 +242,35 @@ int MESA_handle_runtime_log_creation(const char *conf_path)
int MESA_handle_runtime_log_reconstruction(const char *conf_path) 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]; char zlog_rule_conf_content[MAX_HANDLE_LOG_PATH + 1];
time_t t; time_t t;
struct tm local_time; struct tm local_time;
if (access(conf_path, R_OK) != -1) static unsigned char weekday_str[7][4] =
{ {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
int rc = zlog_reload(conf_path);
#ifdef DEBUG
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", static unsigned char month_str[12][4] = {"Jan", "Feb", "Mar", "Apr",
"May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
if (!rc) if (!rc)
{
strcpy(global_conf_filepath, conf_path);
zlog_profile();
if (g_zlog_conf_fp != -1)
{ {
strcpy(global_conf_filepath, conf_path); time(&t);
zlog_profile(); if (NULL != (localtime_r(&t, &local_time)))
if (g_zlog_conf_fp != -1)
{ {
time(&t); snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content),
if (NULL != (localtime_r(&t, &local_time))) "\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);
snprintf(zlog_rule_conf_content, sizeof(zlog_rule_conf_content), write(g_zlog_conf_fp, zlog_rule_conf_content, strlen(zlog_rule_conf_content));
"\n%s %s %d %02d:%02d:%02d %d, RECONSTRUCTION to %s\n", weekday_str[local_time.tm_wday], fsync(g_zlog_conf_fp);
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 #endif
return rc; return rc;
}
return -1;
} }
void MESA_handle_runtime_log_destruction() void MESA_handle_runtime_log_destruction()