--- lbbs/src/log.c	2025/06/04 13:42:53	1.20
+++ lbbs/src/log.c	2025/12/18 02:54:16	1.36
@@ -1,48 +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 <leaflet@leafok.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include "common.h"
 #include "io.h"
-#include <stdio.h>
+#include "log.h"
+#include <errno.h>
 #include <stdarg.h>
-#include <sys/types.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <sys/types.h>
 
-#define _POSIX_C_SOURCE 200809L
-#include <string.h>
+enum _log_constant_t
+{
+	STR_LOG_TIME_MAX_LEN = 50,
+};
 
-FILE *fp_common_log;
-FILE *fp_error_log;
+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)
+{
+	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';
 
-int log_begin(char *common_log_file, char *error_log_file)
-{
-	fp_common_log = fopen(common_log_file, "a");
+	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;
 }
 
@@ -52,68 +65,90 @@ void log_end()
 	fclose(fp_error_log);
 }
 
-int log_head(char *buf, size_t len)
+inline static void log_head(char *buf, size_t len, int log_level, const char *app_file, int app_line)
 {
 	time_t t;
 	struct tm gm_tm;
-	char s_time[256];
+	char s_time[STR_LOG_TIME_MAX_LEN + 1];
 
 	time(&t);
 	gmtime_r(&t, &gm_tm);
 	strftime(s_time, sizeof(s_time), "%Y-%m-%d %H:%M:%S", &gm_tm);
-	snprintf(buf, len, "[%s] [%d] ", s_time, getpid());
 
-	return 0;
+	if (log_level == LOG_LEVEL_COMMON)
+	{
+		snprintf(buf, len, "[%s] [%d] [INFO] ", s_time, getpid());
+	}
+	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_common(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;
-	char buf[1024];
-
-	log_head(buf, sizeof(buf));
-	strncat(buf, format, sizeof(buf) - strnlen(buf, sizeof(buf)));
-
-	va_start(args, format);
-	retval = vfprintf(fp_common_log, buf, args);
-	va_end(args);
+	char buf[LINE_BUFFER_LEN];
+	FILE *fp_log;
 
-	fflush(fp_common_log);
+	fp_log = (log_level == LOG_LEVEL_COMMON ? fp_common_log : fp_error_log);
 
-	return retval;
-}
-
-int log_error(const char *format, ...)
-{
-	va_list args;
-	int retval;
-	char buf[1024];
-
-	log_head(buf, sizeof(buf));
+	log_head(buf, sizeof(buf), log_level, app_file, app_line);
 	strncat(buf, format, sizeof(buf) - strnlen(buf, sizeof(buf)));
 
 	va_start(args, format);
-	retval = vfprintf(fp_error_log, buf, args);
+	retval = vfprintf(fp_log, buf, args);
 	va_end(args);
 
-	fflush(fp_error_log);
+	fflush(fp_log);
 
 	return retval;
 }
 
 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;
 }