5 Commits

4 changed files with 24 additions and 9 deletions

View File

@@ -17,7 +17,7 @@ class loggingRecipe(ConanFile):
default_options = {"shared": False, "fPIC": True,"test":True}
exports_sources = "include/*", "CMakeLists.txt", "src/*", "tests/*"
exports_sources = "include/*", "CMakeLists.txt", "src/*", "tests/*", "LICENSE"
def config_options(self):
if self.settings.os == "Windows":
@@ -47,12 +47,8 @@ class loggingRecipe(ConanFile):
def package(self):
copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
copy(self, pattern="*.a", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
copy(self, pattern="*.so", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
copy(self, pattern="*.lib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
copy(self, pattern="*.dll", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=False)
copy(self, pattern="*.dylib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
cmake = CMake(self)
cmake.install()
def package_info(self):
self.cpp_info.libs = ["logging"]

View File

@@ -81,6 +81,13 @@ void loggingDestroyAll(void);
*/
void loggingDestroyLogger(Logger *logger);
/**
* @brief 替换默认日志器
* @param logger 日志器
* @return
*/
bool loggingReplaceDefaultLogger(Logger *logger);
#ifdef __cplusplus
}
#endif

View File

@@ -6,7 +6,6 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#define RED "\033[0;31m"
@@ -257,6 +256,20 @@ Logger *loggingGetLogger(const char *name) {
return logger;
}
bool loggingReplaceDefaultLogger(Logger *logger) {
if (logger == NULL) {
return false;
}
if (ROOT_LOGGER == NULL) {
ROOT_LOGGER = logger;
} else {
loggingDestroyLogger(ROOT_LOGGER);
ROOT_LOGGER = logger;
}
return true;
}
void loggingDestroyLogger(Logger *logger) {
if (logger != NULL) {
if (logger->handler != NULL) {

View File

@@ -1,6 +1,5 @@
#include "utils/logging-map.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
void foreach_callback(const char *key, void *value, void *user_data) {