daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tlog

Browse Source
This commit is contained in:
Nick Peng
2019-08-09 20:40:50 +08:00
parent 3f7bc30f65
commit 5082f1ae55
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/tlog.c
View File

@@ -33,7 +33,6 @@
#endif #endif
#define TLOG_BUFF_SIZE (1024 * 128) #define TLOG_BUFF_SIZE (1024 * 128)
#define TLOG_MAX_LINE_LEN (1024)
#define TLOG_TMP_LEN 128 #define TLOG_TMP_LEN 128
#define TLOG_LOG_SIZE (1024 * 1024 * 50) #define TLOG_LOG_SIZE (1024 * 1024 * 50)
#define TLOG_LOG_COUNT 32 #define TLOG_LOG_COUNT 32
@@ -125,10 +124,10 @@ struct tlog_info_inter {
typedef int (*list_callback)(const char *name, struct dirent *entry, void *user); typedef int (*list_callback)(const char *name, struct dirent *entry, void *user);
typedef int (*vprint_callback)(char *buff, int maxlen, void *userptr, const char *format, va_list ap); typedef int (*vprint_callback)(char *buff, int maxlen, void *userptr, const char *format, va_list ap);
struct tlog tlog; static struct tlog tlog;
static int tlog_disable_early_print = 0; static int tlog_disable_early_print = 0;
static tlog_level tlog_set_level = TLOG_INFO; static tlog_level tlog_set_level = TLOG_INFO;
tlog_format_func tlog_format; static tlog_format_func tlog_format;
static unsigned int tlog_localtime_lock = 0; static unsigned int tlog_localtime_lock = 0;
static const char *tlog_level_str[] = { static const char *tlog_level_str[] = {
@@ -341,8 +340,9 @@ static int _tlog_root_log_buffer(char *buff, int maxlen, void *userptr, const ch
int log_len = 0; int log_len = 0;
struct tlog_info_inter *info_inter = (struct tlog_info_inter *)userptr; struct tlog_info_inter *info_inter = (struct tlog_info_inter *)userptr;
struct tlog_segment_log_head *log_head = NULL; struct tlog_segment_log_head *log_head = NULL;
int max_format_len = 0;
if (tlog_format == NULL) { if (tlog_format == NULL) {
return -1; return -1;
} }
@@ -352,11 +352,17 @@ static int _tlog_root_log_buffer(char *buff, int maxlen, void *userptr, const ch
memcpy(&log_head->info, &info_inter->info, sizeof(log_head->info)); memcpy(&log_head->info, &info_inter->info, sizeof(log_head->info));
} }
log_len = tlog_format(buff + len, maxlen - len, &info_inter->info, info_inter->userptr, format, ap); max_format_len = maxlen - len - 2;
if (log_len < 0) { log_len = tlog_format(buff + len, max_format_len, &info_inter->info, info_inter->userptr, format, ap);
if (log_len < 0) {
return -1; return -1;
} } else if (log_len >= max_format_len) {
len += log_len; buff[max_format_len - 1] = '.';
buff[max_format_len - 2] = '.';
buff[max_format_len - 3] = '.';
log_len = max_format_len;
}
len += log_len;
/* add new line character*/ /* add new line character*/
if (*(buff + len - 1) != '\n' && len + 1 < maxlen - len) { if (*(buff + len - 1) != '\n' && len + 1 < maxlen - len) {
@@ -443,11 +449,14 @@ static int _tlog_vprintf(struct tlog_log *log, vprint_callback print_callback, v
} }
len = print_callback(buff, sizeof(buff), userptr, format, ap); len = print_callback(buff, sizeof(buff), userptr, format, ap);
if (len <= 0 || len >= TLOG_MAX_LINE_LEN) { if (len <= 0) {
return -1; return -1;
} } else if (len >= TLOG_MAX_LINE_LEN) {
strncpy(buff, "[LOG TOO LONG, DISCARD]\n", sizeof(buff));
len = strnlen(buff, sizeof(buff));
}
pthread_mutex_lock(&tlog.lock); pthread_mutex_lock(&tlog.lock);
do { do {
if (log->end == log->start) { if (log->end == log->start) {
if (log->ext_end == 0) { if (log->ext_end == 0) {
@@ -519,7 +528,7 @@ static int _tlog_vprintf(struct tlog_log *log, vprint_callback print_callback, v
int tlog_vprintf(struct tlog_log *log, const char *format, va_list ap) int tlog_vprintf(struct tlog_log *log, const char *format, va_list ap)
{ {
return _tlog_vprintf(log, _tlog_print_buffer, 0, format, ap); return _tlog_vprintf(log, _tlog_print_buffer, NULL, format, ap);
} }
int tlog_printf(struct tlog_log *log, const char *format, ...) int tlog_printf(struct tlog_log *log, const char *format, ...)
@@ -1112,7 +1121,7 @@ static int _tlog_any_has_data(void)
static int _tlog_wait_pids(void) static int _tlog_wait_pids(void)
{ {
time_t now = time(0); time_t now = time(NULL);
struct tlog_log *next = NULL; struct tlog_log *next = NULL;
static struct tlog_log *last_log = NULL; static struct tlog_log *last_log = NULL;
@@ -1312,7 +1321,6 @@ static void *_tlog_work(void *arg)
while (1) { while (1) {
log_len = 0; log_len = 0;
log_end = 0;
log_extlen = 0; log_extlen = 0;
log_extend = 0; log_extend = 0;
if (tlog.run == 0) { if (tlog.run == 0) {
@@ -1404,7 +1412,7 @@ const char *tlog_get_level_string(tlog_level level)
return tlog_level_str[level]; return tlog_level_str[level];
} }
void _tlog_log_setlogscreen(struct tlog_log *log, int enable) static void _tlog_log_setlogscreen(struct tlog_log *log, int enable)
{ {
if (log == NULL) { if (log == NULL) {
return; return;
@@ -1584,8 +1592,8 @@ int tlog_init(const char *logfile, int maxlogsize, int maxlogcount, int buffsize
tlog.is_wait = 0; tlog.is_wait = 0;
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_cond_init(&tlog.cond, 0); pthread_cond_init(&tlog.cond, NULL);
pthread_mutex_init(&tlog.lock, 0); pthread_mutex_init(&tlog.lock, NULL);
tlog.run = 1; tlog.run = 1;
log = tlog_open(logfile, maxlogsize, maxlogcount, buffsize, flag); log = tlog_open(logfile, maxlogsize, maxlogcount, buffsize, flag);

8
src/tlog.h
View File

@@ -32,6 +32,10 @@ struct tlog_time {
int usec; int usec;
}; };
#ifndef TLOG_MAX_LINE_LEN
#define TLOG_MAX_LINE_LEN (1024)
#endif
/* TLOG FLAGS LIST */ /* TLOG FLAGS LIST */
/* set tlog not compress file when archive */ /* set tlog not compress file when archive */
#define TLOG_NOCOMPRESS (1 << 0) #define TLOG_NOCOMPRESS (1 << 0)
@@ -70,7 +74,7 @@ format: Log formats
#define tlog(level, format, ...) tlog_ext(level, BASE_FILE_NAME, __LINE__, __func__, 0, format, ##__VA_ARGS__) #define tlog(level, format, ...) tlog_ext(level, BASE_FILE_NAME, __LINE__, __func__, 0, format, ##__VA_ARGS__)
extern int tlog_ext(tlog_level level, const char *file, int line, const char *func, void *userptr, const char *format, ...) extern int tlog_ext(tlog_level level, const char *file, int line, const char *func, void *userptr, const char *format, ...)
__attribute__((format(printf, 6, 7))); __attribute__((format(printf, 6, 7))) __attribute__((nonnull (6)));
extern int tlog_vext(tlog_level level, const char *file, int line, const char *func, void *userptr, const char *format, va_list ap); extern int tlog_vext(tlog_level level, const char *file, int line, const char *func, void *userptr, const char *format, va_list ap);
/* write buff to log file */ /* write buff to log file */
@@ -142,7 +146,7 @@ Function: Print log to log stream
log: log stream log: log stream
format: Log formats format: Log formats
*/ */
extern int tlog_printf(tlog_log *log, const char *format, ...) __attribute__((format(printf, 2, 3))); extern int tlog_printf(tlog_log *log, const char *format, ...) __attribute__((format(printf, 2, 3))) __attribute__((nonnull (1, 2)));
/* /*
Function: Print log to log stream with ap Function: Print log to log stream with ap