日志操作器默认使用控制台处理器
This commit is contained in:
@@ -12,6 +12,6 @@ typedef struct log_Handler {
|
|||||||
|
|
||||||
|
|
||||||
log_Handler* fileHandler(const char* name);
|
log_Handler* fileHandler(const char* name);
|
||||||
log_Handler* consoleHandler(const char* name);
|
log_Handler* consoleHandler();
|
||||||
|
|
||||||
#endif //__LOGGING_HANDLER_H__
|
#endif //__LOGGING_HANDLER_H__
|
||||||
@@ -7,24 +7,25 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 释放组件
|
* @brief 释放组件
|
||||||
* @param
|
* @param handler 处理器
|
||||||
*/
|
*/
|
||||||
static void __freeConsoleHandler(log_Handler *handler) { free(handler); }
|
static void __freeConsoleHandler(log_Handler *handler) { free(handler); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 输出组件
|
* @brief 输出组件
|
||||||
* @param
|
* @param handler 处理器
|
||||||
|
* @param message 消息
|
||||||
*/
|
*/
|
||||||
static void outputConsoleHandler(log_Handler *handler, const char *message) {
|
static void outputConsoleHandler(log_Handler *handler, const char *message) {
|
||||||
fputs(message, handler->stream);
|
fputs(message, handler->stream);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description :控制台日志处理器
|
* @brief :控制台日志处理器
|
||||||
* @param
|
* @param
|
||||||
*/
|
*/
|
||||||
log_Handler *consoleHandler(const char *name) {
|
log_Handler *consoleHandler() {
|
||||||
log_Handler *handler = (log_Handler *)malloc(sizeof(log_Handler));
|
log_Handler *handler = (log_Handler *)malloc(sizeof(log_Handler));
|
||||||
|
|
||||||
handler->stream = stdout;
|
handler->stream = stdout;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description :文件日志处理器释放组件
|
* @brief 文件日志处理器释放组件
|
||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -17,7 +17,7 @@ static void __freeFileHandler(log_Handler *handler) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description :文件日志处理器输出组件
|
* @brief 文件日志处理器输出组件
|
||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -26,13 +26,14 @@ static void outputFileHandler(log_Handler *handler, const char *message) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description :文件日志处理器
|
* @brief 文件日志处理器
|
||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
log_Handler *fileHandler(const char *name) {
|
log_Handler *fileHandler(const char *name) {
|
||||||
char new_file_name[100];
|
char new_file_name[100];
|
||||||
sprintf(new_file_name, "%s.log", name);
|
sprintf(new_file_name, "%s.log", name);
|
||||||
|
|
||||||
FILE *fp = fopen(new_file_name, "at");
|
FILE *fp = fopen(new_file_name, "at");
|
||||||
|
|
||||||
log_Handler *handler = (log_Handler *)malloc(sizeof(log_Handler));
|
log_Handler *handler = (log_Handler *)malloc(sizeof(log_Handler));
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
********************************************/
|
********************************************/
|
||||||
|
|
||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
|
#include "logging/logging-handler.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -49,10 +50,10 @@ static void addHandler(log_Handler *handler) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description : 添加日志拦截器
|
* @description : 添加日志拦截器
|
||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void addInterceptor(log_Interceptor *Interceptor) {
|
void addInterceptor(log_Interceptor *Interceptor) {
|
||||||
if (G_LOGGER == NULL) {
|
if (G_LOGGER == NULL) {
|
||||||
return;
|
return;
|
||||||
@@ -169,6 +170,7 @@ static Logger *getLogger(const char *name, log_level level) {
|
|||||||
if (G_LOGGER != NULL) {
|
if (G_LOGGER != NULL) {
|
||||||
return G_LOGGER;
|
return G_LOGGER;
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger *logger = (Logger *)malloc(sizeof(Logger));
|
Logger *logger = (Logger *)malloc(sizeof(Logger));
|
||||||
logger->fatal = fatal;
|
logger->fatal = fatal;
|
||||||
logger->error = error;
|
logger->error = error;
|
||||||
@@ -180,7 +182,7 @@ static Logger *getLogger(const char *name, log_level level) {
|
|||||||
logger->addInterceptor = addInterceptor;
|
logger->addInterceptor = addInterceptor;
|
||||||
|
|
||||||
logger->level = level;
|
logger->level = level;
|
||||||
logger->handler = NULL;
|
logger->handler = consoleHandler(name);
|
||||||
logger->name = name;
|
logger->name = name;
|
||||||
logger->interceptor = NULL;
|
logger->interceptor = NULL;
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
int main() {
|
int main() {
|
||||||
Logging *log = createLogging();
|
Logging *log = createLogging();
|
||||||
Logger *logger = log->getLogger("testLogger", LOG_DEBUG);
|
Logger *logger = log->getLogger("testLogger", LOG_DEBUG);
|
||||||
logger->addHandler(consoleHandler("test"));
|
|
||||||
|
|
||||||
logger->info("This is an info message");
|
logger->info("This is an info message");
|
||||||
logger->error("你好,这是一个错误消息%s", "123");
|
logger->error("你好,这是一个错误消息%s", "123");
|
||||||
@@ -22,7 +21,6 @@ int main() {
|
|||||||
logger->info("This is an info message");
|
logger->info("This is an info message");
|
||||||
logger->error("你好,这是一个错误消息%s", "123");
|
logger->error("你好,这是一个错误消息%s", "123");
|
||||||
logger->fatal("This is an fatal message");
|
logger->fatal("This is an fatal message");
|
||||||
|
|
||||||
logger->debug("This is a debug message");
|
logger->debug("This is a debug message");
|
||||||
logger->warning("This is a warning message%s", "123");
|
logger->warning("This is a warning message%s", "123");
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
int main() {
|
int main() {
|
||||||
Logging *log = createLogging();
|
Logging *log = createLogging();
|
||||||
Logger *logger = log->getLogger("testLogger",LOG_DEBUG);
|
Logger *logger = log->getLogger("testLogger",LOG_DEBUG);
|
||||||
logger->addHandler(consoleHandler("test"));
|
|
||||||
|
|
||||||
logger->info("This is an info message");
|
logger->info("This is an info message");
|
||||||
logger->error("你好,这是一个错误消息%s", "123");
|
logger->error("你好,这是一个错误消息%s", "123");
|
||||||
@@ -12,6 +11,7 @@ int main() {
|
|||||||
logger->debug("This is a debug message");
|
logger->debug("This is a debug message");
|
||||||
logger->warning("This is a warning message%s", "123");
|
logger->warning("This is a warning message%s", "123");
|
||||||
|
|
||||||
|
|
||||||
destroyLogging(log);
|
destroyLogging(log);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user