--- lbbs/src/log.c 2025/11/05 04:19:21 1.30 +++ lbbs/src/log.c 2025/12/18 02:54:16 1.36 @@ -6,9 +6,14 @@ * Copyright (C) 2004-2025 Leaflet */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "common.h" #include "io.h" #include "log.h" +#include #include #include #include @@ -20,25 +25,37 @@ enum _log_constant_t STR_LOG_TIME_MAX_LEN = 50, }; +static char path_common_log[FILE_PATH_LEN]; +static char path_error_log[FILE_PATH_LEN]; static FILE *fp_common_log; static FILE *fp_error_log; +static int redir_common_log = 0; +static int redir_error_log = 0; int log_begin(const char *common_log_file, const char *error_log_file) { - fp_common_log = fopen(common_log_file, "a"); + strncpy(path_common_log, common_log_file, sizeof(path_common_log) - 1); + path_common_log[sizeof(path_common_log) - 1] = '\0'; + strncpy(path_error_log, error_log_file, sizeof(path_error_log) - 1); + path_error_log[sizeof(path_error_log) - 1] = '\0'; + + fp_common_log = fopen(path_common_log, "a"); if (fp_common_log == NULL) { - perror("log_begin failed\n"); + fprintf(stderr, "fopen(%s) error: %d\n", path_common_log, errno); return -1; } - fp_error_log = fopen(error_log_file, "a"); + fp_error_log = fopen(path_error_log, "a"); if (fp_error_log == NULL) { - perror("log_begin failed\n"); + fprintf(stderr, "fopen(%s) error: %d\n", path_error_log, errno); return -2; } + redir_common_log = 0; + redir_error_log = 0; + return 0; } @@ -62,10 +79,14 @@ inline static void log_head(char *buf, s { snprintf(buf, len, "[%s] [%d] [INFO] ", s_time, getpid()); } - else // if (log_level == LOG_LEVEL_ERROR) + else if (log_level == LOG_LEVEL_ERROR) { snprintf(buf, len, "[%s] [%d] [ERROR] [%s:%d] ", s_time, getpid(), app_file, app_line); } + else // if (log_level == LOG_LEVEL_DEBUG) + { + snprintf(buf, len, "[%s] [%d] [DEBUG] [%s:%d] ", s_time, getpid(), app_file, app_line); + } } int log_printf(enum log_level_t log_level, const char *app_file, int app_line, const char *format, ...) @@ -75,7 +96,7 @@ int log_printf(enum log_level_t log_leve char buf[LINE_BUFFER_LEN]; FILE *fp_log; - fp_log = (log_level == LOG_LEVEL_ERROR ? fp_error_log : fp_common_log); + fp_log = (log_level == LOG_LEVEL_COMMON ? fp_common_log : fp_error_log); log_head(buf, sizeof(buf), log_level, app_file, app_line); strncat(buf, format, sizeof(buf) - strnlen(buf, sizeof(buf))); @@ -91,16 +112,43 @@ int log_printf(enum log_level_t log_leve int log_common_redir(int fd) { - int ret; - close(fileno(fp_common_log)); - ret = dup2(fd, fileno(fp_common_log)); - return ret; + redir_common_log = 1; + return dup2(fd, fileno(fp_common_log)); } int log_error_redir(int fd) { - int ret; - close(fileno(fp_error_log)); - ret = dup2(fd, fileno(fp_error_log)); - return ret; + redir_error_log = 1; + return dup2(fd, fileno(fp_error_log)); +} + +int log_restart(void) +{ + FILE *fp; + + if (!redir_common_log) + { + fp = fopen(path_common_log, "a"); + if (fp == NULL) + { + log_error("fopen(%s) error: %d\n", path_common_log, errno); + return -1; + } + fclose(fp_common_log); + fp_common_log = fp; + } + + if (!redir_error_log) + { + fp = fopen(path_error_log, "a"); + if (fp == NULL) + { + log_error("fopen(%s) error: %d\n", path_error_log, errno); + return -2; + } + fclose(fp_error_log); + fp_error_log = fp; + } + + return 0; }