Dev (#11)
* #feat 增强Fatal级别的底色,修改logging类的方法 * 更新版本号 * 加入test脚本 * fix:conanfile * test action * 修复错别字 * add test on windows action * fix test on windows action * fix action on windows * fix * fix 内存分配错误 * fix msvc 不支持中文注释,删除中文注释 * test on windows and test chinese char * ersion 0.2.4 * feature:根据文件大小分割日志 * fix:内存泄露 * fix:使用char偏移单位
This commit is contained in:
@@ -8,6 +8,9 @@
|
||||
#include "logging/logging-handler.h"
|
||||
#include "logging/logging-interceptor.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct Logger {
|
||||
log_level level;
|
||||
@@ -20,18 +23,35 @@ typedef struct Logger {
|
||||
void (*info)(const char *format, ...);
|
||||
void (*debug)(const char *format, ...);
|
||||
|
||||
void (*addHandler)(log_Handler *handler);
|
||||
void (*addInterceptor)(log_Interceptor *Interceptor);
|
||||
bool (*addHandler)(log_Handler *handler);
|
||||
bool (*addInterceptor)(log_Interceptor *Interceptor);
|
||||
} Logger;
|
||||
|
||||
/**
|
||||
* @brief 创建日志对象,日志对象为单例模式,后续可通过getDefaultLogger方法获取,
|
||||
重复调用该方法不会创建新的日志对象,只会返回默认日志对象,并且会修改默认日志对象的名称和等级
|
||||
* @param name 日志名称
|
||||
* @param level 日志等级
|
||||
* @return Logger* 日志对象指针
|
||||
*/
|
||||
Logger *newLogger(const char *name, log_level level);
|
||||
/**
|
||||
* @brief 设置日志等级
|
||||
* @param logger 日志对象
|
||||
* @param level 日志等级
|
||||
*/
|
||||
log_status setLevel(Logger *logger, log_level level);
|
||||
/**
|
||||
* @brief 获取默认日志对象
|
||||
*/
|
||||
Logger *getDefaultLogger(void);
|
||||
/**
|
||||
* @brief 销毁日志对象,该方法会销毁默认日志对象
|
||||
*/
|
||||
log_status destroyLogger(void);
|
||||
|
||||
typedef struct Logging {
|
||||
Logger *(*getLogger)(const char *name, log_level level);
|
||||
log_status (*setLevel)(Logger *logger, log_level level);
|
||||
Logger *(*getCurrentLogger)(void);
|
||||
log_status (*destroyLogging)(struct Logging *logging);
|
||||
} Logging;
|
||||
|
||||
Logging *newLogging();
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // __LOGGING_H__
|
||||
@@ -1,6 +1,10 @@
|
||||
#ifndef __LOGGING_CORE_H__
|
||||
#define __LOGGING_CORE_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
LOG_FATAL,
|
||||
LOG_ERROR,
|
||||
@@ -14,4 +18,8 @@ typedef enum {
|
||||
L_OK,
|
||||
} log_status;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // __LOGGING_CORE_H__
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct log_Handler {
|
||||
void *stream;
|
||||
bool apply_color;
|
||||
@@ -10,7 +14,11 @@ typedef struct log_Handler {
|
||||
void (*output)(struct log_Handler *handler, const char *message);
|
||||
} log_Handler;
|
||||
|
||||
log_Handler *loggingFileHandler(const char *name);
|
||||
log_Handler *loggingFileHandler(const char *name, unsigned int max_size);
|
||||
log_Handler *loggingConsoleHandler();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif //__LOGGING_HANDLER_H__
|
||||
@@ -4,6 +4,10 @@
|
||||
#include "logging-core.h"
|
||||
#include "logging-handler.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct log_Interceptor {
|
||||
log_level level;
|
||||
log_Handler *handler;
|
||||
@@ -12,15 +16,21 @@ typedef struct log_Interceptor {
|
||||
|
||||
} log_Interceptor;
|
||||
|
||||
|
||||
/**
|
||||
* @brief 子字符串拦截器
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
* @brief 子字符串拦截器
|
||||
* @param keywords: 关键字数组
|
||||
* @param count: 关键字数组长度
|
||||
* @param level: 最低拦截日志等级
|
||||
* @param handler: 日志处理器,用于处理拦截下来的日志
|
||||
* @return log_Interceptor *
|
||||
*/
|
||||
log_Interceptor *loggingSubStringInterceptor(char *keywords[],
|
||||
int count,
|
||||
log_level level,
|
||||
log_Handler *handler);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // __LOGGING_INTERCEPTOR_H__
|
||||
Reference in New Issue
Block a user