From 7e9d7612512189a6c478a469b6e05482a8c2df99 Mon Sep 17 00:00:00 2001 From: youmetme <321640253@qq.com> Date: Sat, 18 Oct 2025 09:12:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0README=EF=BC=8C?= =?UTF-8?q?=E5=8D=87=E7=BA=A7logging=E4=BE=9D=E8=B5=96=E8=87=B31.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c4742f..691636c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ conan create . 在你的项目的conanfile.txt中添加 ```txt [requires] -logging/0.5.0 +logging/1.0.0 ``` ```shell -- 2.49.1 From 5b218d5f9da119618c33149a9b6c75ba4953a984 Mon Sep 17 00:00:00 2001 From: youmetme <321640253@qq.com> Date: Mon, 3 Nov 2025 16:39:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 12 +++++------ README.md | 12 +++++------ include/logging.h | 47 ++++++++++++++++++++++--------------------- src/logging.c | 32 ++++++++++++++--------------- tests/test-filter.c | 6 +++--- tests/test-log-file.c | 4 ++-- tests/test-logs.c | 8 ++++---- tests/test-simple.c | 2 +- 8 files changed, 62 insertions(+), 61 deletions(-) diff --git a/README.en.md b/README.en.md index 270e53d..32c9be3 100644 --- a/README.en.md +++ b/README.en.md @@ -38,7 +38,7 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } ``` @@ -50,7 +50,7 @@ int main() { int main() { log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); - addHandler(getDefaultLogger(), hander); + loggingAddHandler(loggingGetDefaultLogger(), hander); Log_info("This is an info message"); Log_error("This is an error message%s", "123"); @@ -58,7 +58,7 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } ``` @@ -91,7 +91,7 @@ int main() { loggingHandlerFile("test_interceptor", 1024 * 1024), false); - addFilter(getDefaultLogger(), tint); + loggingAddFilter(loggingGetDefaultLogger(), tint); char *test2[] = {"123", NULL}; @@ -101,7 +101,7 @@ int main() { loggingHandlerFile("test_interceptor1", 1024 * 1024), true); - addFilter(getDefaultLogger(), tint1); + loggingAddFilter(loggingGetDefaultLogger(), tint1); printf("\n"); printf("filter added\n"); @@ -113,7 +113,7 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } ``` diff --git a/README.md b/README.md index 691636c..864ce27 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } ``` @@ -65,7 +65,7 @@ int main() { int main() { log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); - addHandler(getDefaultLogger(), hander); + loggingAddHandler(loggingGetDefaultLogger(), hander); Log_info("This is an info message"); Log_error("This is an error message%s", "123"); @@ -73,7 +73,7 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } ``` @@ -107,7 +107,7 @@ int main() { loggingHandlerFile("test_interceptor", 1024 * 1024), false); - addFilter(getDefaultLogger(), tint); + loggingAddFilter(loggingGetDefaultLogger(), tint); char *test2[] = {"123", NULL}; @@ -117,7 +117,7 @@ int main() { loggingHandlerFile("test_interceptor1", 1024 * 1024), true); - addFilter(getDefaultLogger(), tint1); + loggingAddFilter(loggingGetDefaultLogger(), tint1); printf("\n"); printf("filter added\n"); @@ -129,7 +129,7 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } ``` diff --git a/include/logging.h b/include/logging.h index af9fa6b..281ef25 100644 --- a/include/logging.h +++ b/include/logging.h @@ -15,27 +15,28 @@ extern "C" { // 默认日志器宏 #define Log_fatal(format, ...) \ - logMessage(NULL, LOG_FATAL, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(NULL, LOG_FATAL, __FILE__, __LINE__, format, ##__VA_ARGS__) #define Log_error(format, ...) \ - logMessage(NULL, LOG_ERROR, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(NULL, LOG_ERROR, __FILE__, __LINE__, format, ##__VA_ARGS__) #define Log_warning(format, ...) \ - logMessage(NULL, LOG_WARNING, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(NULL, LOG_WARNING, __FILE__, __LINE__, format, ##__VA_ARGS__) #define Log_info(format, ...) \ - logMessage(NULL, LOG_INFO, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(NULL, LOG_INFO, __FILE__, __LINE__, format, ##__VA_ARGS__) #define Log_debug(format, ...) \ - logMessage(NULL, LOG_DEBUG, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(NULL, LOG_DEBUG, __FILE__, __LINE__, format, ##__VA_ARGS__) // 日志器宏 #define log_fatal(logger, format, ...) \ - logMessage(logger, LOG_FATAL, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(logger, LOG_FATAL, __FILE__, __LINE__, format, ##__VA_ARGS__) #define log_error(logger, format, ...) \ - logMessage(logger, LOG_ERROR, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(logger, LOG_ERROR, __FILE__, __LINE__, format, ##__VA_ARGS__) #define log_warning(logger, format, ...) \ - logMessage(logger, LOG_WARNING, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage( \ + logger, LOG_WARNING, __FILE__, __LINE__, format, ##__VA_ARGS__) #define log_info(logger, format, ...) \ - logMessage(logger, LOG_INFO, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(logger, LOG_INFO, __FILE__, __LINE__, format, ##__VA_ARGS__) #define log_debug(logger, format, ...) \ - logMessage(logger, LOG_DEBUG, __FILE__, __LINE__, format, ##__VA_ARGS__) + loggingMessage(logger, LOG_DEBUG, __FILE__, __LINE__, format, ##__VA_ARGS__) typedef struct Logger { log_level level; @@ -44,41 +45,41 @@ typedef struct Logger { const char *name; } Logger; -bool addHandler(Logger *logger, log_Handler *handler); -bool addFilter(Logger *logger, log_filter *filter); +bool loggingAddHandler(Logger *logger, log_Handler *handler); +bool loggingAddFilter(Logger *logger, log_filter *filter); -void logMessage(Logger *logger, - log_level level, - const char *file, - int line, - const char *message, - ...); +void loggingMessage(Logger *logger, + log_level level, + const char *file, + int line, + const char *message, + ...); /** * @brief 创建一个日志句柄对象 * @param name 日志器名称 * @return 日志句柄对象 */ -Logger *newLogger(const char *name); +Logger *loggingNewLogger(const char *name); /** * @brief 获取默认日志对象 * @return 默认日志对象 */ -Logger *getDefaultLogger(void); +Logger *loggingGetDefaultLogger(void); -Logger *getLogger(const char *name); +Logger *loggingGetLogger(const char *name); /** * @brief 销毁日志对象,该方法会销毁默认日志对象 */ -void destroyDefaultLogger(void); +void loggingDestroyAll(void); /** * @brief 销毁日志对象 * @param logger 日志对象 * @return void */ -void destroyLogger(Logger *logger); +void loggingDestroyLogger(Logger *logger); #ifdef __cplusplus } diff --git a/src/logging.c b/src/logging.c index 310ef49..073ae74 100644 --- a/src/logging.c +++ b/src/logging.c @@ -27,7 +27,7 @@ static Map *LOGGER_MAP = NULL; // 日志对象映射表 * @brief 为日志添加一个handler * @param handler 处理器对象 */ -bool addHandler(Logger *logger, log_Handler *handler) { +bool loggingAddHandler(Logger *logger, log_Handler *handler) { if (logger == NULL || handler == NULL) { return false; } @@ -45,7 +45,7 @@ bool addHandler(Logger *logger, log_Handler *handler) { * @brief 为日志添加一个filter * @param filter 过滤器对象 */ -bool addFilter(Logger *logger, log_filter *filter) { +bool loggingAddFilter(Logger *logger, log_filter *filter) { if (logger == NULL || filter == NULL) { return false; } @@ -142,16 +142,16 @@ log_cope(Logger *logger, char *level, const char *color, const char *message) { output_to_handler(logger, level, color, message); } -void logMessage(Logger *logger, - log_level level, - const char *file, - int line, - const char *message, - ...) { +void loggingMessage(Logger *logger, + log_level level, + const char *file, + int line, + const char *message, + ...) { Logger *_logger = NULL; if (logger == NULL) { if (ROOT_LOGGER == NULL) { - ROOT_LOGGER = newLogger("ROOT"); // 创建根日志对象 + ROOT_LOGGER = loggingNewLogger("ROOT"); // 创建根日志对象 } _logger = ROOT_LOGGER; } else { @@ -197,7 +197,7 @@ void logMessage(Logger *logger, * @param name 日志器名称 * @return 日志器对象 */ -Logger *newLogger(const char *name) { +Logger *loggingNewLogger(const char *name) { Logger *logger = (Logger *)malloc(sizeof(Logger)); if (logger == NULL) { return NULL; @@ -217,12 +217,12 @@ Logger *newLogger(const char *name) { return logger; } -Logger *getDefaultLogger(void) { +Logger *loggingGetDefaultLogger(void) { if (ROOT_LOGGER != NULL) { return ROOT_LOGGER; } - ROOT_LOGGER = newLogger("ROOT"); + ROOT_LOGGER = loggingNewLogger("ROOT"); return ROOT_LOGGER; } @@ -232,7 +232,7 @@ Logger *getDefaultLogger(void) { * @param level 日志等级 * @return 日志器对象 */ -Logger *getLogger(const char *name) { +Logger *loggingGetLogger(const char *name) { if (name == NULL) { return NULL; } @@ -257,7 +257,7 @@ Logger *getLogger(const char *name) { return logger; } -void destroyLogger(Logger *logger) { +void loggingDestroyLogger(Logger *logger) { if (logger != NULL) { if (logger->handler != NULL) { logger->handler->_free(logger->handler); @@ -280,13 +280,13 @@ static void __destroyLoggerForeach(const char *key, void *value, void *user_data) { (void)user_data; (void)key; - destroyLogger(*(Logger **)value); + loggingDestroyLogger(*(Logger **)value); } /** * @brief 销毁日志对象 */ -void destroyDefaultLogger(void) { +void loggingDestroyAll(void) { map_foreach(LOGGER_MAP, __destroyLoggerForeach, NULL); map_destroy(LOGGER_MAP); } \ No newline at end of file diff --git a/tests/test-filter.c b/tests/test-filter.c index 74babda..3e35c38 100644 --- a/tests/test-filter.c +++ b/tests/test-filter.c @@ -20,7 +20,7 @@ int main() { loggingHandlerFile("test_interceptor", 1024 * 1024), false); - addFilter(getDefaultLogger(), tint); + loggingAddFilter(loggingGetDefaultLogger(), tint); char *test2[] = {"123", NULL}; @@ -30,7 +30,7 @@ int main() { loggingHandlerFile("test_interceptor1", 1024 * 1024), true); - addFilter(getDefaultLogger(), tint1); + loggingAddFilter(loggingGetDefaultLogger(), tint1); printf("\n"); printf("filter added\n"); @@ -42,6 +42,6 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } \ No newline at end of file diff --git a/tests/test-log-file.c b/tests/test-log-file.c index 0cb136e..b7279d9 100644 --- a/tests/test-log-file.c +++ b/tests/test-log-file.c @@ -3,7 +3,7 @@ int main() { log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); - addHandler(getDefaultLogger(), hander); + loggingAddHandler(loggingGetDefaultLogger(), hander); Log_info("This is an info message"); Log_error("This is an error message%s", "123"); @@ -11,6 +11,6 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } \ No newline at end of file diff --git a/tests/test-logs.c b/tests/test-logs.c index bf17fcd..41b00a3 100644 --- a/tests/test-logs.c +++ b/tests/test-logs.c @@ -3,13 +3,13 @@ #include int main() { - Logger *t1 = getLogger("Test1"); + Logger *t1 = loggingGetLogger("Test1"); t1->level = LOG_ERROR; - Logger *t2 = getLogger("Test2"); + Logger *t2 = loggingGetLogger("Test2"); t2->level = LOG_DEBUG; - Logger *t11 = getLogger("Test1"); + Logger *t11 = loggingGetLogger("Test1"); if (t1 == t11) { printf("t1 and t11 are the same\n"); @@ -19,6 +19,6 @@ int main() { return 1; } - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } \ No newline at end of file diff --git a/tests/test-simple.c b/tests/test-simple.c index 42a5a07..097ad8c 100644 --- a/tests/test-simple.c +++ b/tests/test-simple.c @@ -7,6 +7,6 @@ int main() { Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - destroyDefaultLogger(); + loggingDestroyAll(); return 0; } \ No newline at end of file -- 2.49.1