From 4c2677100744cfa66d55d5f551523231799a781b Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 14 Apr 2022 10:08:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://master.iot-yun.club:2280/framwork
---
booster/logger.h | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/booster/logger.h b/booster/logger.h
index 7031761..786bdf8 100644
--- a/booster/logger.h
+++ b/booster/logger.h
@@ -32,7 +32,7 @@
#define FILENAME_LEN 64
#endif
-#define DBG_LOG_FILE "stderr" /* Debug mode log file is console */
+#define LOG_STDERR "stderr" /* Debug mode log file is console */
#define LOG_ROLLBACK_SIZE 512 /* Default rollback log size */
#define LOG_ROLLBACK_NONE 0 /* Set rollback size to 0 will not rollback */
@@ -45,13 +45,11 @@
enum
{
LOG_LEVEL_DISB = 0, /* Disable "Debug" */
- LOG_LEVEL_FATAL, /* Debug Level "Fatal" */
LOG_LEVEL_ERROR, /* Debug Level "ERROR" */
LOG_LEVEL_WARN, /* Debug Level "warnning" */
LOG_LEVEL_NRML, /* Debug Level "Normal" */
LOG_LEVEL_DEBUG, /* Debug Level "Debug" */
LOG_LEVEL_INFO, /* Debug Level "Information" */
- LOG_LEVEL_TRACE, /* Debug Level "Trace" */
LOG_LEVEL_MAX,
};
@@ -76,14 +74,12 @@
extern char *log_str[];
/* log_size unit is KB */
-extern int logger_init(logger_t *logger, char *filename, int level, int log_size);
-extern int logger_open(void);
-extern void logger_set_time_format(char *time_format);
-extern int logger_reopen(void);
-extern void logger_close(void);
-extern void logger_term(void);
-extern void logger_raw(const char *fmt, ...);
+extern int log_open(logger_t *logger, char *filename, int level, int log_size);
+extern int log_reopen(void);
+extern void log_close(void);
+/* lowlvel API */
+extern void logger_raw(const char *fmt, ...);
extern void logger_min(int level, char *fmt, ...);
extern void logger_line(int level, char *file, int line, char *fmt, ...);
extern void logger_str(int level, const char *msg);
@@ -92,21 +88,17 @@
#define LOG_FILE_LINE /* Log the file and line */
#ifdef LOG_FILE_LINE
-#define log_trace(fmt, ...) logger_line(LOG_LEVEL_TRACE, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
#define log_info(fmt, ...) logger_line(LOG_LEVEL_INFO, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
#define log_dbg(fmt, ...) logger_line(LOG_LEVEL_DEBUG, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
#define log_nrml(fmt, ...) logger_line(LOG_LEVEL_NRML, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
#define log_warn(fmt, ...) logger_line(LOG_LEVEL_WARN, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
#define log_err(fmt, ...) logger_line(LOG_LEVEL_ERROR, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
-#define log_fatal(fmt, ...) logger_line(LOG_LEVEL_FATAL, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
#else
-#define log_trace(fmt, ...) logger_min(LOG_LEVEL_TRACE, fmt, ##__VA_ARGS__)
#define log_info(fmt, ...) logger_min(LOG_LEVEL_INFO, fmt, ##__VA_ARGS__)
#define log_dbg(fmt, ...) logger_min(LOG_LEVEL_DEBUG, fmt, ##__VA_ARGS__)
#define log_nrml(fmt, ...) logger_min(LOG_LEVEL_NRML, fmt, ##__VA_ARGS__)
#define log_warn(fmt, ...) logger_min(LOG_LEVEL_WARN, fmt, ##__VA_ARGS__)
#define log_err(fmt, ...) logger_min(LOG_LEVEL_ERROR, fmt, ##__VA_ARGS__)
-#define log_fatal(fmt, ...) logger_min(LOG_LEVEL_FATAL, fmt, ##__VA_ARGS__)
#endif
#endif /* ----- #ifndef _LOGGER_H_ ----- */
--
Gitblit v1.9.1