fix:内存泄露

This commit is contained in:
2024-11-20 11:18:13 +08:00
parent de03985fef
commit e57f0fa02c
8 changed files with 126 additions and 96 deletions

View File

@@ -1,6 +1,7 @@
#include "logging.h"
#include "logging/logging-handler.h"
#include "utils/logging-utils.h"
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -22,32 +23,32 @@ Logger *G_LOGGER = NULL;
* @brief 为日志添加一个handler
* @param handler 处理器对象
*/
static void addHandler(log_Handler *handler) {
if (G_LOGGER == NULL) {
return;
static bool addHandler(log_Handler *handler) {
if (G_LOGGER == NULL || handler == NULL) {
return false;
}
if (G_LOGGER->handler == NULL) {
G_LOGGER->handler = handler;
return;
return true;
}
G_LOGGER->handler->_free(G_LOGGER->handler);
G_LOGGER->handler = handler;
return true;
}
void addInterceptor(log_Interceptor *Interceptor) {
if (G_LOGGER == NULL) {
return;
static bool addInterceptor(log_Interceptor *Interceptor) {
if (G_LOGGER == NULL || Interceptor == NULL) {
return false;
}
if (G_LOGGER->interceptor == NULL) {
G_LOGGER->interceptor = Interceptor;
return;
return true;
}
G_LOGGER->interceptor->_free(G_LOGGER->interceptor);
G_LOGGER->interceptor = Interceptor;
return true;
}
/**
@@ -90,8 +91,12 @@ _builtin_log(char *level, const char *color, const char *message, ...) {
RESET,
message);
else
sprintf(
logStr, "[%s]: %s %s %s\n", G_LOGGER->name, timeStr, level, message);
sprintf(logStr,
"[%s]: %s %s %s\n",
G_LOGGER->name,
timeStr,
level,
message);
handler->output(handler, logStr);
}
@@ -151,7 +156,7 @@ static void debug(const char *message, ...) {
}
}
static Logger *getLogger(const char *name, log_level level) {
Logger *newLogger(const char *name, log_level level) {
if (G_LOGGER != NULL) {
G_LOGGER->name = name;
G_LOGGER->level = level;
@@ -179,12 +184,9 @@ static Logger *getLogger(const char *name, log_level level) {
}
/**
* @description :销毁日志对象
* @brief 销毁日志对象
*/
log_status destroyLogging(Logging *logging) {
if (logging == NULL) {
return L_ERROR;
}
log_status destroyLogger(void) {
if (G_LOGGER != NULL) {
if (G_LOGGER->handler != NULL) {
G_LOGGER->handler->_free(G_LOGGER->handler);
@@ -197,21 +199,12 @@ log_status destroyLogging(Logging *logging) {
free(G_LOGGER);
G_LOGGER = NULL;
}
free(logging);
return L_OK;
}
Logger *getCurrentLogger(void) {
Logger *getDefaultLogger(void) {
if (G_LOGGER == NULL) {
return NULL;
}
return G_LOGGER;
}
Logging *newLogging() {
Logging *logging = (Logging *)malloc(sizeof(Logging));
logging->getLogger = getLogger;
logging->destroyLogging = destroyLogging;
logging->getCurrentLogger = getCurrentLogger;
return logging;
}