--- lbbs/src/log.c 2025/06/04 14:41:17 1.22 +++ lbbs/src/log.c 2025/11/17 11:22:16 1.35 @@ -1,51 +1,61 @@ -/*************************************************************************** - log.c - description - ------------------- - Copyright : (C) 2004-2025 by Leaflet - Email : leaflet@leafok.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * log + * - logger + * + * Copyright (C) 2004-2025 Leaflet + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif -#include "log.h" -#include "io.h" #include "common.h" +#include "io.h" +#include "log.h" +#include #include -#include +#include #include #include +#include -#define _POSIX_C_SOURCE 200809L -#include - -#define STR_LOG_TIME_MAX_LEN 50 +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(char *common_log_file, char *error_log_file) +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; } @@ -71,11 +81,11 @@ inline static void log_head(char *buf, s } else // if (log_level == LOG_LEVEL_ERROR) { - snprintf(buf, len, "[%s] [%d] [ERROR] [%s : %d] ", s_time, getpid(), app_file, app_line); + snprintf(buf, len, "[%s] [%d] [ERROR] [%s:%d] ", s_time, getpid(), app_file, app_line); } } -int log_printf(int log_level, const char *app_file, int app_line, const char *format, ...) +int log_printf(enum log_level_t log_level, const char *app_file, int app_line, const char *format, ...) { va_list args; int retval; @@ -98,16 +108,43 @@ int log_printf(int log_level, const char 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; }