youmetme/logging
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 2 Wiki Activity

Dev (#17)

Browse Source 
* #将拦截器改名为过滤器，更加接近职能
This commit is contained in:
youmetme
2024-11-23 08:47:48 +08:00
committed by GitHub
parent f0c3a5d56a
commit 064881c0ad
16 changed files with 166 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ project(logging)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SRC)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/handler SRC)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/interceptor SRC)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/filter SRC)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/utils SRC)
if (SHARED)

55
src/interceptor/logging-interceptor-substr.c → src/filter/logging-filter-substr.c
View File

@@ -1,4 +1,4 @@
#include "logging/logging-interceptor.h"
#include "logging/logging-filter.h"
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@ -55,20 +55,20 @@ static bool kmp_search(char *substr, char *master) {
return false;
}
static bool _disposeSubstring(log_Interceptor *interceptor,
log_level level,
const char *message,
static bool _disposeSubstring(log_filter *filter,
log_level level,
const char *message,
...) {
int count = 0;
keywords_t *keyword = (keywords_t *)(interceptor + 1);
keywords_t *keyword = (keywords_t *)(filter + 1);
if (keyword->key == NULL && keyword->next == NULL) {
if (level <= interceptor->level)
if (level <= filter->level)
return true;
return false;
}
while (keyword != NULL && level <= interceptor->level) {
while (keyword != NULL && level <= filter->level) {
if (kmp_search(keyword->key, (char *)message))
return true;
keyword = keyword->next;
@@ -77,9 +77,9 @@ static bool _disposeSubstring(log_Interceptor *interceptor,
return false;
}
static void _freeSubstring(log_Interceptor *interceptor) {
static void _freeFilter(log_filter *filter) {
keywords_t *it_keyword =
(keywords_t *)(interceptor + 1); // it_keyword 不是起始地址，请勿free
(keywords_t *)(filter + 1); // it_keyword 不是起始地址，请勿free
keywords_t *keyword = it_keyword->next;
keywords_t *next = NULL;
@@ -90,30 +90,31 @@ static void _freeSubstring(log_Interceptor *interceptor) {
keyword = next;
}
if (interceptor->handler != NULL) {
interceptor->handler->_free(interceptor->handler);
if (filter->handler != NULL) {
filter->handler->_free(filter->handler);
}
if (it_keyword->key != NULL)
free(it_keyword->key);
free(interceptor);
free(filter);
}
log_Interceptor *loggingSubStringInterceptor(char *keywords[],
log_level level,
log_Handler *handler,
bool jump_out) {
log_Interceptor *interceptor =
(log_Interceptor *)malloc(sizeof(log_Interceptor) + sizeof(keywords_t));
interceptor->_dispose = _disposeSubstring;
interceptor->handler = handler;
interceptor->level = level;
interceptor->jump_out = jump_out;
interceptor->_free = _freeSubstring;
log_filter *loggingFilterSubStr(char *keywords[],
log_level level,
log_Handler *handler,
bool jump_out) {
// 分配log_filter和keywords_t的连续内存
log_filter *filter =
(log_filter *)malloc(sizeof(log_filter) + sizeof(keywords_t));
filter->_dispose = _disposeSubstring;
filter->handler = handler;
filter->level = level;
filter->jump_out = jump_out;
filter->_free = _freeFilter;
keywords_t *keyword = (keywords_t *)(interceptor + 1);
keyword->key = NULL;
int count = 0;
keywords_t *keyword = (keywords_t *)(filter + 1);
keyword->key = NULL;
int count = 0;
if (keywords[count] != NULL) {
keyword->key = strdup(keywords[count]);
count++;
@@ -128,5 +129,5 @@ log_Interceptor *loggingSubStringInterceptor(char *keywords[],
}
keyword->next = NULL;
return interceptor;
return filter;
}

10
src/handler/logging-handler-console.c
View File

@@ -2,19 +2,19 @@
#include <stdio.h>
#include <stdlib.h>
static void __freeConsoleHandler(log_Handler *handler) { free(handler); }
static void __freeHandlerConsole(log_Handler *handler) { free(handler); }
static void outputConsoleHandler(log_Handler *handler, const char *message) {
static void __outputHandlerConsole(log_Handler *handler, const char *message) {
fputs(message, handler->stream);
}
log_Handler *loggingConsoleHandler() {
log_Handler *loggingHandlerConsole() {
log_Handler *handler = (log_Handler *)malloc(sizeof(log_Handler));
handler->stream = stdout;
handler->apply_color = true;
handler->_free = __freeConsoleHandler;
handler->output = outputConsoleHandler;
handler->_free = __freeHandlerConsole;
handler->output = __outputHandlerConsole;
return handler;
}

2
src/handler/logging-handler-file.c
View File

@@ -49,7 +49,7 @@ static void outputFileHandler(log_Handler *handler, const char *message) {
changeFile(handler);
}
log_Handler *loggingFileHandler(const char *name, unsigned int max_size) {
log_Handler *loggingHandlerFile(const char *name, unsigned int max_size) {
char new_file_name[FILE_NAME_MAX_SIZE];
int suffix = 0;
unsigned int file_size;

42
src/logging.c
View File

@@ -38,23 +38,23 @@ static bool addHandler(log_Handler *handler) {
return true;
}
static bool addInterceptor(log_Interceptor *Interceptor) {
if (G_LOGGER == NULL || Interceptor == NULL) {
static bool addFilter(log_filter *filter) {
if (G_LOGGER == NULL || filter == NULL) {
return false;
}
if (G_LOGGER->interceptor == NULL) {
G_LOGGER->interceptor = Interceptor;
G_LOGGER->interceptor->next = NULL;
if (G_LOGGER->filter == NULL) {
G_LOGGER->filter = filter;
G_LOGGER->filter->next = NULL;
return true;
}
log_Interceptor *it = G_LOGGER->interceptor;
log_filter *it = G_LOGGER->filter;
while (it->next != NULL) {
it = it->next;
}
it->next = Interceptor;
Interceptor->next = NULL;
it->next = filter;
filter->next = NULL;
return true;
}
@@ -104,8 +104,8 @@ static void _builtin_cope(log_level level_e,
return;
}
log_Interceptor *it = G_LOGGER->interceptor;
log_Handler *handler = G_LOGGER->handler;
log_filter *it = G_LOGGER->filter;
log_Handler *handler = G_LOGGER->handler;
while (it != NULL) {
if (it->_dispose(it, level_e, message)) {
@@ -180,17 +180,17 @@ Logger *newDefaultLogger(const char *name, log_level level) {
return G_LOGGER;
}
Logger *logger = (Logger *)malloc(sizeof(Logger));
Logger *logger = (Logger *)malloc(sizeof(Logger));
logger->addHandler = addHandler;
logger->addInterceptor = addInterceptor;
logger->addHandler = addHandler;
logger->addFilter = addFilter;
logger->level = level;
logger->handler = loggingConsoleHandler();
logger->name = name;
logger->interceptor = NULL;
logger->level = level;
logger->handler = loggingHandlerConsole();
logger->name = name;
logger->filter = NULL;
G_LOGGER = logger;
G_LOGGER = logger;
return G_LOGGER;
}
@@ -203,9 +203,9 @@ log_status destroyDefaultLogger(void) {
G_LOGGER->handler->_free(G_LOGGER->handler);
}
if (G_LOGGER->interceptor != NULL) {
log_Interceptor *it = G_LOGGER->interceptor;
log_Interceptor *next = NULL;
if (G_LOGGER->filter != NULL) {
log_filter *it = G_LOGGER->filter;
log_filter *next = NULL;
while (it != NULL) {
next = it->next;
it->_free(it);

8
src/utils/logging-utils.c
View File

@@ -1,11 +1,11 @@
#include "logging-utils.h"
#include <time.h>
#include <string.h>
#include <time.h>
/**
* @brief 获取当前时间字符串
* @param timeStr 存储时间字符串缓冲区指针
*/
* @brief 获取当前时间字符串
* @param timeStr 存储时间字符串缓冲区指针
*/
void getTimeStr(char *timeStr) {
time_t t = time(NULL);
struct tm *p = localtime(&t);