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

fix msvc 不支持中文注释，删除中文注释

Browse Source
This commit is contained in:
你遇了我
2024-11-02 20:20:30 +08:00
parent 34f818196e
commit 668f88f8af
10 changed files with 26 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,29 +1,13 @@
/********************************************
* @Date: 2024 09 18
* @Description: 控制台日志处理器
********************************************/
#include "logging/logging-handler.h"
#include <stdio.h>
#include <stdlib.h>
/**
* @brief 释放组件
* @param handler 处理器
*/
static void __freeConsoleHandler(log_Handler *handler) { free(handler); }
/**
* @brief 输出组件
* @param handler 处理器
* @param message 消息
*/
static void outputConsoleHandler(log_Handler *handler, const char *message) {
fputs(message, handler->stream);
}
/**
* @brief ：控制台日志处理器
*/
log_Handler *loggingConsoleHandler() {
log_Handler *handler = (log_Handler *)malloc(sizeof(log_Handler));

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

@@ -1,33 +1,16 @@
/********************************************
* @Date: 2024 09 18
* @Description: 文件日志处理器
********************************************/
#include "logging/logging-handler.h"
#include <stdio.h>
#include <stdlib.h>
/**
* @brief 文件日志处理器释放组件
*/
static void __freeFileHandler(log_Handler *handler) {
fclose(handler->stream);
free(handler);
}
/**
* @brief 文件日志处理器输出组件
* @param handler 文件日志处理器
* @param message 消息
*/
static void outputFileHandler(log_Handler *handler, const char *message) {
fputs(message, handler->stream);
}
/**
* @brief 文件日志处理器
* @param name 文件名
* @return log_Handler *
*/
log_Handler *loggingFileHandler(const char *name) {
char new_file_name[100];
sprintf(new_file_name, "%s.log", name);

25
src/interceptor/logging-interceptor-substr.c
View File

@@ -1,8 +1,3 @@
/********************************************
* @Date: 2024 08 12
* @Description: 子串拦截器
*********************************************/
#include "logging/logging-interceptor.h"
#include <stdbool.h>
#include <stdio.h>
@@ -54,11 +49,6 @@ static bool kmp_search(char *substr, char *master) {
return false;
}
/**
* @description 处理
* @param
* @return
*/
static bool _disposeSubstring(char *level, const char *message, ...) {
int count = 0;
@@ -76,11 +66,8 @@ static bool _disposeSubstring(char *level, const char *message, ...) {
return false;
}
/**
* @description : 完成拦截器自我释放内存
*/
static void _freeSubstring(log_Interceptor *interceptor) {
if (G_keywords!=NULL) {
if (G_keywords != NULL) {
int sum = 0;
while (G_keywords[sum] != NULL) {
free(G_keywords[sum]);
@@ -94,13 +81,11 @@ static void _freeSubstring(log_Interceptor *interceptor) {
if (interceptor->handler != NULL) {
interceptor->handler->_free(interceptor->handler);
}
if(interceptor!=NULL)free(interceptor);
if (interceptor != NULL)
free(interceptor);
}
/**
* @description : 子字符串拦截器
*/
log_Interceptor *loggingSubStringInterceptor(char *keywords[],
int count,
log_level level,
@@ -112,7 +97,7 @@ log_Interceptor *loggingSubStringInterceptor(char *keywords[],
interceptor->level = level;
interceptor->_free = _freeSubstring;
G_keywords = (char **)malloc((sizeof(G_keywords) * count) + 1);
G_keywords = (char **)malloc((sizeof(G_keywords) * (count + 1)));
for (int i = 0; i < count; i++) {
G_keywords[i] = (char *)malloc(strlen(keywords[i]) + 1);

37
src/logging.c
View File

@@ -1,7 +1,3 @@
/********************************************
* @Date: 2024 08 12
* @Description: 日志模块
********************************************/
#include "logging.h"
#include "logging/logging-handler.h"
#include <stdio.h>
@@ -9,7 +5,6 @@
#include <string.h>
#include <time.h>
#define RED "\033[0;31m"
#define RED_B "\033[0;41m"
#define GREEN "\033[0;32m"
@@ -18,7 +13,6 @@
#define RESET "\033[0m"
#define CYAN "\033[0;36m"
#define LOG_BUFFER_SIZE 1024
Logger *G_LOGGER = NULL;
@@ -31,9 +25,6 @@ static void getTimeStr(char *timeStr) {
strcpy(timeStr, _timeStr);
}
/**
* @description : 添加日志处理器
*/
static void addHandler(log_Handler *handler) {
if (G_LOGGER == NULL) {
return;
@@ -48,11 +39,6 @@ static void addHandler(log_Handler *handler) {
G_LOGGER->handler = handler;
}
/**
* @description : 添加日志拦截器
* @param
* @return
*/
void addInterceptor(log_Interceptor *Interceptor) {
if (G_LOGGER == NULL) {
return;
@@ -67,9 +53,6 @@ void addInterceptor(log_Interceptor *Interceptor) {
G_LOGGER->interceptor = Interceptor;
}
/**
* @description : 内置日志记录函数
*/
static void
_builtin_log(char *level, const char *color, const char *message, ...) {
if (G_LOGGER == NULL) {
@@ -84,7 +67,6 @@ _builtin_log(char *level, const char *color, const char *message, ...) {
log_Handler *handler = G_LOGGER->handler;
// 通过拦截器
if (G_LOGGER->interceptor != NULL) {
if (G_LOGGER->interceptor->_dispose(level, message)) {
if (G_LOGGER->interceptor->handler != NULL) {
@@ -93,7 +75,6 @@ _builtin_log(char *level, const char *color, const char *message, ...) {
}
}
// 判断处理器是否应用颜色
if (handler->apply_color)
sprintf(logStr,
"%s: %s %s%s%s %s\n",
@@ -110,7 +91,6 @@ _builtin_log(char *level, const char *color, const char *message, ...) {
handler->output(handler, logStr);
}
//*************************记录日志******************************* */
static void fatal(const char *message, ...) {
if (G_LOGGER->level >= LOG_ERROR) {
char logStr[LOG_BUFFER_SIZE];
@@ -165,13 +145,7 @@ static void debug(const char *message, ...) {
_builtin_log("Debug", CYAN, logStr, args);
}
}
//*************************记录日志******************************* */
/**
* @description :获取一个日志操作对象
* @param
* @return
*/
static Logger *getLogger(const char *name, log_level level) {
if (G_LOGGER != NULL) {
G_LOGGER->name = name;
@@ -180,7 +154,7 @@ static Logger *getLogger(const char *name, log_level level) {
}
Logger *logger = (Logger *)malloc(sizeof(Logger));
// 方法
logger->fatal = fatal;
logger->error = error;
logger->warning = warning;
@@ -190,7 +164,6 @@ static Logger *getLogger(const char *name, log_level level) {
logger->addHandler = addHandler;
logger->addInterceptor = addInterceptor;
// 属性
logger->level = level;
logger->handler = loggingConsoleHandler();
logger->name = name;
@@ -223,10 +196,6 @@ log_status destroyLogging(Logging *logging) {
return L_OK;
}
/**
* @description :获取当前日志操作对象
* @return 当前唯一的日志操作对象
*/
Logger *getCurrentLogger(void) {
if (G_LOGGER == NULL) {
return NULL;
@@ -234,10 +203,6 @@ Logger *getCurrentLogger(void) {
return G_LOGGER;
}
/**
* @description :创建一个日志对象
* @return :Logging* 返回一个日志对象
*/
Logging *newLogging() {
Logging *logging = (Logging *)malloc(sizeof(Logging));
logging->getLogger = getLogger;