feat: integrate logging api to core

6 files changed, 14 insertions, 117 deletions

diff --git a/src/module/GpgFrontendModuleInit.cpp b/src/module/GpgFrontendModuleInit.cpp
index 5db3b0b6..b2d29c71 100644
--- a/src/module/GpgFrontendModuleInit.cpp
+++ b/src/module/GpgFrontendModuleInit.cpp
@@ -40,14 +40,6 @@
 
 namespace GpgFrontend::Module {
 
-void LoadGpgFrontendModulesLoggingSystem(spdlog::level::level_enum log_level) {
-  GpgFrontend::Module::SDK::InitModuleLoggingSystem(log_level);
-}
-
-void ShutdownGpgFrontendModulesLoggingSystem() {
-  GpgFrontend::Module::SDK::ShutdownModuleLoggingSystem();
-}
-
 void LoadGpgFrontendModules(ModuleInitArgs args) {
   // must init at default thread before core
   Thread::TaskRunnerGetter::GetInstance().GetTaskRunner()->PostTask(
diff --git a/src/module/GpgFrontendModuleInit.h b/src/module/GpgFrontendModuleInit.h
index c7071856..a3a8bbd3 100644
--- a/src/module/GpgFrontendModuleInit.h
+++ b/src/module/GpgFrontendModuleInit.h
@@ -37,20 +37,6 @@ struct ModuleInitArgs {
 };
 
 /**
- * @brief
- *
- * @param args
- */
-void GPGFRONTEND_MODULE_EXPORT
-LoadGpgFrontendModulesLoggingSystem(spdlog::level::level_enum log_level);
-
-/**
- * @brief
- *
- */
-void GPGFRONTEND_MODULE_EXPORT ShutdownGpgFrontendModulesLoggingSystem();
-
-/**
  * @brief init the module library
  *
  */
diff --git a/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.cpp b/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.cpp
index 9477848b..84dd49cb 100644
--- a/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.cpp
+++ b/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.cpp
@@ -392,8 +392,7 @@ int GnuPGInfoGatheringModule::Exec(EventRefrernce event) {
   UpsertRTValue(GetModuleIdentifier(), "gnupg.gathering_done", true);
   event->ExecuteCallback(GetModuleIdentifier(), TransferParams(true));
 
-  SPDLOG_INFO("gnupg external info gathering done");
-
+  MODULE_LOG_DEBUG("gnupg external info gathering done");
   return 0;
 }
 
diff --git a/src/module/integrated/version_checking_module/VersionCheckTask.cpp b/src/module/integrated/version_checking_module/VersionCheckTask.cpp
index 85eb07c4..bacce396 100644
--- a/src/module/integrated/version_checking_module/VersionCheckTask.cpp
+++ b/src/module/integrated/version_checking_module/VersionCheckTask.cpp
@@ -93,7 +93,7 @@ void VersionCheckTask::slot_parse_latest_version_info() {
         MODULE_LOG_DEBUG("latest version matched: {}", latest_version);
       } else {
         latest_version = current_version_;
-        SPDLOG_WARN("latest version unknown");
+        MODULE_LOG_WARN("latest version unknown");
       }
 
       bool prerelease = latest_reply_json["prerelease"];
diff --git a/src/module/sdk/Log.cpp b/src/module/sdk/Log.cpp
index b70f5bbb..7b0e4cca 100644
--- a/src/module/sdk/Log.cpp
+++ b/src/module/sdk/Log.cpp
@@ -37,60 +37,4 @@
 
 #include "core/function/GlobalSettingStation.h"
 
-namespace GpgFrontend::Module::SDK {
-
-void InitModuleLoggingSystem(spdlog::level::level_enum level) {
-  // get the log directory
-  auto log_file_path =
-      (GpgFrontend::GlobalSettingStation::GetInstance().GetLogDir() / "module");
-  log_file_path.replace_extension(".log");
-
-  // sinks
-  std::vector<spdlog::sink_ptr> sinks;
-  sinks.push_back(GpgFrontend::SecureCreateSharedObject<
-                  spdlog::sinks::stderr_color_sink_mt>());
-  sinks.push_back(GpgFrontend::SecureCreateSharedObject<
-                  spdlog::sinks::rotating_file_sink_mt>(
-      log_file_path.u8string(), 1048576 * 32, 32));
-
-  // thread pool
-  spdlog::init_thread_pool(1024, 2);
-
-  // logger
-  auto module_logger =
-      GpgFrontend::SecureCreateSharedObject<spdlog::async_logger>(
-          "module", begin(sinks), end(sinks), spdlog::thread_pool());
-  module_logger->set_pattern(
-      "[%H:%M:%S.%e] [T:%t] [%=6n] %^[%=8l]%$ [%s:%#] [%!] -> %v (+%ius)");
-
-  // set the level of logger
-  module_logger->set_level(level);
-
-  // flush policy
-  module_logger->flush_on(spdlog::level::err);
-  spdlog::flush_every(std::chrono::seconds(5));
-
-  // register it as default logger
-  spdlog::set_default_logger(module_logger);
-}
-
-void ShutdownModuleLoggingSystem() {
-#ifdef WINDOWS
-  // Under VisualStudio, this must be called before main finishes to workaround
-  // a known VS issue
-  spdlog::drop_all();
-  spdlog::shutdown();
-#endif
-}
-
-auto GetModuleLogger() -> std::shared_ptr<spdlog::logger> {
-  // check if logging system is initalized
-  auto ptr = spdlog::get("module");
-  if (ptr == nullptr) {
-    throw std::runtime_error("logging system of modules is not initialized");
-  }
-
-  return spdlog::get("module");
-}
-
-}  // namespace GpgFrontend::Module::SDK
+namespace GpgFrontend::Module::SDK {}  // namespace GpgFrontend::Module::SDK
diff --git a/src/module/sdk/Log.h b/src/module/sdk/Log.h
index bff9893e..0c40a097 100644
--- a/src/module/sdk/Log.h
+++ b/src/module/sdk/Log.h
@@ -28,18 +28,14 @@
 
 #pragma once
 
+#include "core/utils/LogUtils.h"
 #include "module/sdk/GpgFrontendModuleSDK.h"
 
-#define MODULE_LOG_TRACE(...) \
-  SPDLOG_LOGGER_TRACE(GpgFrontend::Module::SDK::GetModuleLogger(), __VA_ARGS__)
-#define MODULE_LOG_DEBUG(...) \
-  SPDLOG_LOGGER_DEBUG(GpgFrontend::Module::SDK::GetModuleLogger(), __VA_ARGS__)
-#define MODULE_LOG_INFO(...) \
-  SPDLOG_LOGGER_INFO(GpgFrontend::Module::SDK::GetModuleLogger(), __VA_ARGS__)
-#define MODULE_LOG_WARN(...) \
-  SPDLOG_LOGGER_WARN(GpgFrontend::Module::SDK::GetModuleLogger(), __VA_ARGS__)
-#define MODULE_LOG_ERROR(...) \
-  SPDLOG_LOGGER_ERROR(GpgFrontend::Module::SDK::GetModuleLogger(), __VA_ARGS__)
+#define MODULE_LOG_TRACE(...) GF_LOG_TRACE("module", __VA_ARGS__)
+#define MODULE_LOG_DEBUG(...) GF_LOG_DEBUG("module", __VA_ARGS__)
+#define MODULE_LOG_INFO(...) GF_LOG_INFO("module", __VA_ARGS__)
+#define MODULE_LOG_WARN(...) GF_LOG_WARN("module", __VA_ARGS__)
+#define MODULE_LOG_ERROR(...) GF_LOG_ERROR("module", __VA_ARGS__)
 
 namespace spdlog {
 class logger;
@@ -47,49 +43,29 @@ class logger;
 
 namespace GpgFrontend::Module::SDK {
 
-/**
- * @brief
- *
- */
-void GPGFRONTEND_MODULE_SDK_EXPORT
-    InitModuleLoggingSystem(spdlog::level::level_enum);
-
-/**
- * @brief
- *
- */
-void GPGFRONTEND_MODULE_SDK_EXPORT ShutdownModuleLoggingSystem();
-
-/**
- * @brief
- *
- */
-auto GPGFRONTEND_MODULE_SDK_EXPORT GetModuleLogger()
-    -> std::shared_ptr<spdlog::logger>;
-
 template <typename... Args>
 void ModuleLogTrace(const char* fmt, const Args&... args) {
-  SPDLOG_LOGGER_TRACE(GetModuleLogger(), fmt, args...);
+  MODULE_LOG_TRACE(fmt, args...);
 }
 
 template <typename... Args>
 void ModuleLogDebug(const char* fmt, const Args&... args) {
-  SPDLOG_LOGGER_DEBUG(GetModuleLogger(), fmt, args...);
+  MODULE_LOG_DEBUG(fmt, args...);
 }
 
 template <typename... Args>
 void ModuleLogInfo(const char* fmt, const Args&... args) {
-  SPDLOG_LOGGER_INFO(GetModuleLogger(), fmt, args...);
+  MODULE_LOG_INFO(fmt, args...);
 }
 
 template <typename... Args>
 void ModuleLogWarn(const char* fmt, const Args&... args) {
-  SPDLOG_LOGGER_WARN(GetModuleLogger(), fmt, args...);
+  MODULE_LOG_WARN(fmt, args...);
 }
 
 template <typename... Args>
 void ModuleLogError(const char* fmt, const Args&... args) {
-  SPDLOG_LOGGER_ERROR(GetModuleLogger(), fmt, args...);
+  MODULE_LOG_ERROR(fmt, args...);
 }
 
 }  // namespace GpgFrontend::Module::SDK