gfwleak/tango-verify-policy
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志接口支持按文件大小存储日志，并对 table_name 表的结构体进行了优化

Browse Source
This commit is contained in:
fengweihao
2024-08-14 17:57:30 +08:00
parent 1b76ae68fb
commit 6dc39cc922
10 changed files with 523 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/include/log.h
View File

@@ -34,6 +34,7 @@ enum { LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR, LOG_FATAL};
void log_print(struct log_handle *, int level, const char *module, const char *fmt, ...);
void log_options_set_enable(struct log_handle *, int enable);
void log_options_set_level(struct log_handle *, int level);
void log_handle_set_file_max_size(struct log_handle *handle, size_t max_file_size_mb);
struct log_handle * log_handle_create(const char *file_path, int level);
void log_handle_destroy(struct log_handle *);

2
common/include/utils.h
View File

@@ -5,7 +5,7 @@
#define EVAL_TM_STYLE "%Y-%m-%d"
#define VERIFY_SYMBOL_MAX 64
#define VERIFY_PATH_MAX 258
#define VERIFY_PATH_MAX 256
#define VERIFY_STRING_MAX 2048
#define VERIFY_ARRAY_MAX 512
#define MAX_TAG_ID_NUM 128

150
common/src/log.c
View File

@@ -41,6 +41,9 @@ struct log_handle
{
int level;
int enable;
int split_file_by_size;
size_t max_file_size_mb;
int file_index;
FILE *fp;
va_list ap;
char defined_log_fn[1024];
@@ -53,29 +56,6 @@ static unsigned char weekday_str[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fr
static unsigned char month_str[12][4] = {"Jan", "Feb", "Mar", "Apr","May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
static int log_create_dir(const char *dir_path, int path_len)
{
if(dir_path == NULL)
return -1;
char *buf = (char *)calloc(path_len+1, 1);
int ret = -1;
memcpy(buf, dir_path, path_len);
if(access(buf, R_OK) != 0)
{
if(mkdir(buf, 0755)!= 0)
ret = -1;
else
ret = 0;
}
else
ret = 1;
free(buf);
buf = NULL;
return ret;
}
static void log_close_file(struct log_handle *handle)
{
pthread_mutex_lock(&handle->mutex);
@@ -101,38 +81,65 @@ int log_open_file(char *file_name, struct log_handle *handle)
return 0;
}
static int log_create_dir(const char *dir_path, int path_len)
{
if (dir_path == NULL)
{
return -1;
}
char buf[path_len + 1];
strncpy(buf, dir_path, path_len);
buf[path_len] = '\0';
if (access(buf, R_OK) != 0)
{
if (mkdir(buf, 0755) != 0)
{
return -1;
}
}
return 0;
}
static int log_create_path(const char *file_path)
{
FILE *fp = NULL;
if(file_path == NULL)
return 0;
{
return 0;
}
char *p_path = rindex(file_path, '/');
if(p_path==0)
if(p_path == 0)
{
return 0;
}
const char *p_cur = file_path;
int path_len = p_path - file_path;
int i = 0;
if(log_create_dir(file_path, path_len) >= 0)
if(log_create_dir(file_path, path_len) == 0)
{
return 0;
}
for(;i<=path_len;i++,p_cur++)
for(int i = 0; i <= path_len; i++, p_cur++)
{
if(*p_cur == '/')
{
if(log_create_dir(file_path, i+1) < 0)
{
return -1;
}
}
}
if(NULL == (fp = fopen(file_path, "w")))
{
return 0;
FILE *fp = fopen(file_path, "w");
if (NULL == fp) {
return -1;
}
fclose(fp);
return 1;
}
@@ -141,25 +148,53 @@ int log_create_log_file(struct log_handle *handle)
{
time_t t;
struct tm local_time;
char tmp_log_file_name[1024+128];
char tmp_log_file_name[1024 + 128];
time(&t);
if(NULL == (localtime_r(&t, &local_time)))
if (NULL == (localtime_r(&t, &local_time)))
{
return 0;
}
snprintf(tmp_log_file_name, sizeof(tmp_log_file_name), "%s.%04d-%02d-%02d", handle->defined_log_fn, local_time.tm_year + 1900, local_time.tm_mon + 1, local_time.tm_mday);
if(handle->fp == NULL)
if(handle->split_file_by_size == 0)
{
if(0 != log_open_file(tmp_log_file_name, handle)) return 0;
snprintf(tmp_log_file_name, sizeof(tmp_log_file_name), "%s.%04d-%02d-%02d", handle->defined_log_fn, local_time.tm_year + 1900, local_time.tm_mon + 1, local_time.tm_mday);
}
else
{
if (0 != memcmp(tmp_log_file_name, handle->runtime_log_fn, strlen(tmp_log_file_name)))
{
if(0 != log_open_file(tmp_log_file_name, handle))return 0;
}
struct stat file_stat;
snprintf(tmp_log_file_name, sizeof(tmp_log_file_name), "%s.%04d-%02d-%02d-%03d", handle->defined_log_fn, local_time.tm_year + 1900, local_time.tm_mon + 1, local_time.tm_mday, handle->file_index);
if (0 != memcmp(tmp_log_file_name, handle->runtime_log_fn, strlen(tmp_log_file_name)))
{
handle->file_index = 0;
snprintf(tmp_log_file_name, sizeof(tmp_log_file_name), "%s.%04d-%02d-%02d-%03d", handle->defined_log_fn, local_time.tm_year + 1900, local_time.tm_mon + 1, local_time.tm_mday, handle->file_index);
}
if (stat(tmp_log_file_name, &file_stat) == 0)
{
if (file_stat.st_size >= (handle->max_file_size_mb * 1024 * 1024))
{
handle->file_index++;
snprintf(tmp_log_file_name, sizeof(tmp_log_file_name), "%s.%04d-%02d-%02d-%03d", handle->defined_log_fn, local_time.tm_year + 1900, local_time.tm_mon + 1, local_time.tm_mday, handle->file_index);
}
}
}
if (handle->fp == NULL)
{
if (0 != log_open_file(tmp_log_file_name, handle))
{
return 0;
}
}
else
{
if (0 != memcmp(tmp_log_file_name, handle->runtime_log_fn, strlen(tmp_log_file_name)))
{
if (0 != log_open_file(tmp_log_file_name, handle))
{
return 0;
}
}
}
return 1;
@@ -219,24 +254,43 @@ void log_options_set_enable(struct log_handle * handle, int enable)
}
}
void log_handle_set_file_max_size(struct log_handle *handle, size_t max_file_size_mb)
{
if (handle != NULL)
{
handle->split_file_by_size = 1;
handle->max_file_size_mb = max_file_size_mb;
}
}
struct log_handle *log_handle_create(const char *file_path, int level)
{
struct log_handle *handle = ALLOC(struct log_handle, 1);
if(!handle)
if(!handle || strlen(file_path) == 0)
{
return NULL;
goto finish;
}
handle->enable=1;
handle->level = level;
strncpy(handle->defined_log_fn, file_path, 1023);
pthread_mutex_init(&handle->mutex,NULL);
if(handle->enable)
int ret = log_create_path(handle->defined_log_fn);
if (ret < 0)
{
log_create_path(handle->defined_log_fn);
free(handle);
return NULL;
}
pthread_mutex_init(&handle->mutex, NULL);
return handle;
finish:
if(handle)
{
free(handle);
handle=NULL;
}
return NULL;
}
void log_handle_destroy(struct log_handle * handle)