Modified log init function

main
anulax1225 ago%!(EXTRA string=1 year)
parent ac41683ecf
commit 9aea84ec52
  1. 2
      premake5.lua
  2. 4
      src/bakatools/logging/log.cpp
  3. 22
      src/bakatools/logging/log.h

@ -3,6 +3,7 @@ project "bakatools"
language "C++" language "C++"
cppdialect "C++17" cppdialect "C++17"
systemversion "latest" systemversion "latest"
staticruntime "on"
targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
@ -41,7 +42,6 @@ project "bakatools"
runtime "Debug" runtime "Debug"
symbols "on" symbols "on"
filter "configurations:Release" filter "configurations:Release"
defines defines
{ {

@ -5,7 +5,7 @@ namespace Bk {
std::shared_ptr<spdlog::logger> Log::p_core_logger; std::shared_ptr<spdlog::logger> Log::p_core_logger;
std::shared_ptr<spdlog::logger> Log::p_app_logger; std::shared_ptr<spdlog::logger> Log::p_app_logger;
void Log::init() void Log::init(std::string core)
{ {
std::vector<spdlog::sink_ptr> log_sinks; std::vector<spdlog::sink_ptr> log_sinks;
log_sinks.emplace_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>()); log_sinks.emplace_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>());
@ -14,7 +14,7 @@ namespace Bk {
log_sinks[0]->set_pattern("%^[%T] %n: %v%$"); log_sinks[0]->set_pattern("%^[%T] %n: %v%$");
log_sinks[1]->set_pattern("[%T] [%l] %n: %v"); log_sinks[1]->set_pattern("[%T] [%l] %n: %v");
p_core_logger = std::make_shared<spdlog::logger>("BAKARA", begin(log_sinks), end(log_sinks)); p_core_logger = std::make_shared<spdlog::logger>(core, begin(log_sinks), end(log_sinks));
spdlog::register_logger(p_core_logger); spdlog::register_logger(p_core_logger);
p_core_logger->set_level(spdlog::level::trace); p_core_logger->set_level(spdlog::level::trace);
p_core_logger->flush_on(spdlog::level::trace); p_core_logger->flush_on(spdlog::level::trace);

@ -10,7 +10,7 @@ namespace Bk {
class Log class Log
{ {
public: public:
static void init(); static void init(std::string core);
static std::shared_ptr<spdlog::logger>& get_core_logger() { return p_core_logger; } static std::shared_ptr<spdlog::logger>& get_core_logger() { return p_core_logger; }
static std::shared_ptr<spdlog::logger>& get_app_logger() { return p_app_logger; } static std::shared_ptr<spdlog::logger>& get_app_logger() { return p_app_logger; }
@ -19,17 +19,17 @@ namespace Bk {
static std::shared_ptr<spdlog::logger> p_app_logger; static std::shared_ptr<spdlog::logger> p_app_logger;
}; };
#ifdef BK_DEBUG #ifdef BK_DEBUG
#define BK_CORE_TRACE(...) ::Bk::Log::get_core_logger()->trace(__VA_ARGS__) #define BK_CORE_TRACE(...) Bk::Log::get_core_logger()->trace(__VA_ARGS__)
#define BK_CORE_INFO(...) ::Bk::Log::get_core_logger()->info(__VA_ARGS__) #define BK_CORE_INFO(...) Bk::Log::get_core_logger()->info(__VA_ARGS__)
#define BK_CORE_WARN(...) ::Bk::Log::get_core_logger()->warn(__VA_ARGS__) #define BK_CORE_WARN(...) Bk::Log::get_core_logger()->warn(__VA_ARGS__)
#define BK_CORE_ERROR(...) ::Bk::Log::get_core_logger()->error(__VA_ARGS__) #define BK_CORE_ERROR(...) Bk::Log::get_core_logger()->error(__VA_ARGS__)
#define BK_CORE_CRITICAL(...) ::Bk::Log::get_core_logger()->critical(__VA_ARGS__) #define BK_CORE_CRITICAL(...) Bk::Log::get_core_logger()->critical(__VA_ARGS__)
#define BK_TRACE(...) ::Bk::Log::get_app_logger()->trace(__VA_ARGS__) #define BK_TRACE(...) Bk::Log::get_app_logger()->trace(__VA_ARGS__)
#define BK_INFO(...) ::Bk::Log::get_app_logger()->info(__VA_ARGS__) #define BK_INFO(...) Bk::Log::get_app_logger()->info(__VA_ARGS__)
#define BK_WARN(...) ::Bk::Log::get_app_logger()->warn(__VA_ARGS__) #define BK_WARN(...) Bk::Log::get_app_logger()->warn(__VA_ARGS__)
#define BK_ERROR(...) ::Bk::Log::get_app_logger()->error(__VA_ARGS__) #define BK_ERROR(...) Bk::Log::get_app_logger()->error(__VA_ARGS__)
#define BK_CRITICAL(...) ::Bk::Log::get_app_logger()->critical(__VA_ARGS__) #define BK_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__)
#else #else
#define BK_CORE_TRACE(...) #define BK_CORE_TRACE(...)
#define BK_CORE_INFO(...) #define BK_CORE_INFO(...)

Loading…
Cancel
Save