From ca20d51edb126e3fec3aa35aec49635eb4bce6a9 Mon Sep 17 00:00:00 2001 From: youmetme <321640253@qq.com> Date: Sat, 18 Oct 2025 09:04:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=A4=BA=E4=BE=8B=EF=BC=8C=E7=AE=80=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BD=BF=E7=94=A8=E6=96=B9=E5=BC=8F=E5=B9=B6=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E7=89=88=E6=9C=AC=E8=87=B31.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 111 +++++++++++++++---------------------------------- README.md | 71 +++++++------------------------ conanfile.py | 2 +- pyproject.toml | 2 +- 4 files changed, 50 insertions(+), 136 deletions(-) diff --git a/README.en.md b/README.en.md index 7102038..270e53d 100644 --- a/README.en.md +++ b/README.en.md @@ -32,13 +32,11 @@ cmake --install . #include "logging.h" int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); - - log_info("This is an info message"); - log_error("This is an error message%s", "123"); - log_fatal("This is an fatal message"); - log_debug("This is a debug message"); - log_warning("This is a warning message%s", "123"); + Log_info("This is an info message"); + Log_error("This is an error message%s", "123"); + Log_fatal("This is an fatal message"); + Log_debug("This is a debug message"); + Log_warning("This is a warning message%s", "123"); destroyDefaultLogger(); return 0; @@ -51,14 +49,14 @@ int main() { #include "logging/logging-handler.h" int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); - logger->addHandler(loggingHandlerFile("test1", 1024*1024)); + log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); + addHandler(getDefaultLogger(), hander); - log_info("This is an info message"); - log_error("This is an error message%s", "123"); - log_fatal("This is an fatal message"); - log_debug("This is a debug message"); - log_warning("This is a warning message%s", "123"); + Log_info("This is an info message"); + Log_error("This is an error message%s", "123"); + Log_fatal("This is an fatal message"); + Log_debug("This is a debug message"); + Log_warning("This is a warning message%s", "123"); destroyDefaultLogger(); return 0; @@ -69,92 +67,51 @@ int main() { > Support adding custom filters, currently with built-in substring filters > The function of an filter is to redirect filtered logs to the filter's dedicated processor - -#### example -Redirects filtered logs to a dedicated file processor -```c -#include "logging.h" -#include - -int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); - - log_info("This is an info message"); - log_error("This is an error message%s", "123"); - log_fatal("This is an fatal message"); - log_debug("This is a debug message"); - log_warning("This is a warning message%s", "123"); - - char *test1[] = {"123", "tt", NULL}; - - log_filter *tint = loggingFilterSubStr( - test1, - LOG_DEBUG, - loggingHandlerFile("test_interceptor", 1024 * 1024), - true); - - logger->addFilter(tint); - - printf("\n"); - printf("filter added\n"); - printf("\n"); - - log_info("This is an info message"); - log_error("This is an error message%s", "123"); - log_fatal("This is an fatal message"); - log_debug("This is a debug message"); - log_warning("This is a warning message%s", "123"); - - destroyDefaultLogger(); - return 0; -} -``` - #### Multiple substring filters ```c #include "logging.h" +#include "logging/logging-core.h" +#include "logging/logging-filter.h" #include #include #include int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); + Log_info("This is an info message"); + Log_error("This is an error message%s", "123"); + Log_fatal("This is an fatal message"); + Log_debug("This is a debug message"); + Log_warning("This is a warning message%s", "123"); - log_info("This is an info message"); - log_error("This is an error message%s", "123"); - log_fatal("This is an fatal message"); - log_debug("This is a debug message"); - log_warning("This is a warning message%s", "123"); + char *test1[] = {"This", NULL}; - char *test1[] = {"This",NULL}; + log_filter *tint = + loggingFilterSubStr(test1, + LOG_DEBUG, + loggingHandlerFile("test_interceptor", 1024 * 1024), + false); - log_filter *tint = loggingFilterSubStr( - test1, - LOG_DEBUG, - loggingHandlerFile("test_interceptor", 1024 * 1024), - false); + addFilter(getDefaultLogger(), tint); - logger->addFilter(tint); - - char *test2[] = {"123",NULL}; + char *test2[] = {"123", NULL}; log_filter *tint1 = loggingFilterSubStr( test2, - LOG_DEBUG, + LOG_ERROR, loggingHandlerFile("test_interceptor1", 1024 * 1024), true); - logger->addFilter(tint1); + addFilter(getDefaultLogger(), tint1); printf("\n"); printf("filter added\n"); printf("\n"); - log_info("This is an info message"); - log_error("This is an error message%s", "123"); - log_fatal("This is an fatal message"); - log_debug("This is a debug message"); - log_warning("This is a warning message%s", "123"); + Log_info("This is an info message"); + Log_error("This is an error message%s", "123"); + Log_fatal("This is an fatal message"); + Log_debug("This is a debug message"); + Log_warning("This is a warning message%s", "123"); destroyDefaultLogger(); return 0; diff --git a/README.md b/README.md index 882fa4b..6c4742f 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,6 @@ cmake --install . #include "logging.h" int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); - Log_info("This is an info message"); Log_error("This is an error message%s", "123"); Log_fatal("This is an fatal message"); @@ -66,8 +64,8 @@ int main() { #include "logging/logging-handler.h" int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); - logger->addHandler(loggingHandlerFile("test1", 1024*1024)); + log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); + addHandler(getDefaultLogger(), hander); Log_info("This is an info message"); Log_error("This is an error message%s", "123"); @@ -85,82 +83,41 @@ int main() { > 过滤器的作用:可以将过滤到的日志重定向到过滤器的专属处理器中 - -#### 单个子串过滤器 -将过滤到的日志重定向到专属处理器中 -```c -#include "logging.h" -#include - -int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); - - Log_info("This is an info message"); - Log_error("This is an error message%s", "123"); - Log_fatal("This is an fatal message"); - Log_debug("This is a debug message"); - Log_warning("This is a warning message%s", "123"); - - char *test1[] = {"123", "tt", NULL}; - - log_filter *tint = loggingFilterSubStr( - test1, - LOG_DEBUG, - loggingHandlerFile("test_interceptor", 1024 * 1024), - true); - - logger->addFilter(tint); - - printf("\n"); - printf("filter added\n"); - printf("\n"); - - Log_info("This is an info message"); - Log_error("This is an error message%s", "123"); - Log_fatal("This is an fatal message"); - Log_debug("This is a debug message"); - Log_warning("This is a warning message%s", "123"); - - destroyDefaultLogger(); - return 0; -} -``` - #### 多个子串过滤器 ```c #include "logging.h" +#include "logging/logging-core.h" +#include "logging/logging-filter.h" #include #include #include int main() { - Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG); - Log_info("This is an info message"); Log_error("This is an error message%s", "123"); Log_fatal("This is an fatal message"); Log_debug("This is a debug message"); Log_warning("This is a warning message%s", "123"); - char *test1[] = {"This",NULL}; + char *test1[] = {"This", NULL}; - log_filter *tint = loggingFilterSubStr( - test1, - LOG_DEBUG, - loggingHandlerFile("test_interceptor", 1024 * 1024), - false); + log_filter *tint = + loggingFilterSubStr(test1, + LOG_DEBUG, + loggingHandlerFile("test_interceptor", 1024 * 1024), + false); - logger->addFilter(tint); + addFilter(getDefaultLogger(), tint); - char *test2[] = {"123",NULL}; + char *test2[] = {"123", NULL}; log_filter *tint1 = loggingFilterSubStr( test2, - LOG_DEBUG, + LOG_ERROR, loggingHandlerFile("test_interceptor1", 1024 * 1024), true); - logger->addFilter(tint1); + addFilter(getDefaultLogger(), tint1); printf("\n"); printf("filter added\n"); diff --git a/conanfile.py b/conanfile.py index 5153e40..feb387b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,7 +5,7 @@ import os class loggingRecipe(ConanFile): name = "logging" - version = "0.5.1" + version = "1.0.0" license = "MIT" author = "321640253@qq.com" url = "https://github.com/WangZhongDian/logging.git" diff --git a/pyproject.toml b/pyproject.toml index 8f41d9e..629cc91 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "logging" -version = "0.1.0" +version = "1.0.0" description = "Add your description here" readme = "README.md" requires-python = ">=3.12"