dev: Improve logging.

cosmin42 · Sep 8, 2024 · e120015 · e120015
1 parent 9073931
commit e120015
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 0 deletions.
diff --git a/PB/include/pb/Config.h b/PB/include/pb/Config.h
@@ -1,5 +1,12 @@
 #pragma once
 
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#include <spdlog/sinks/msvc_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+#pragma warning(pop)
+
 #include <pb/AspectRatio.h>
 #include <pb/project/PaperSettings.h>
 
@@ -83,6 +90,8 @@ static constexpr const char *DATABASE_NAME = "databasev2.db";
 
 static constexpr unsigned MAX_HASH_CONFLICTS = 200;
 
+static std::shared_ptr<spdlog::logger> LOGGER = nullptr;
+
 } // namespace OneConfig
 
 } // namespace PB
diff --git a/PB/include/pb/PhotoBook.h b/PB/include/pb/PhotoBook.h
@@ -49,6 +49,8 @@ class Photobook final : public PersistenceServiceListener,
                      std::pair<unsigned, unsigned> screenSize);
   ~Photobook() = default;
 
+  void initLogger();
+
   void configure(PhotobookListener *listener);
   void configure(StagedImagesListener *listener);
   void configure(ImageMonitorListener *listener);

diff --git a/PB/src/PhotoBook.cpp b/PB/src/PhotoBook.cpp
@@ -28,6 +28,9 @@ Photobook::Photobook(Path localStatePath, Path installationPath,
           std::make_shared<DirectoryInspectionService>()),
       mOGLEngine(std::make_shared<OGLEngine>())
 {
+
+  initLogger();
+
   ImageFactory::inst().configurePlatformInfo(mPlatformInfo);
   ImageFactory::inst().configurePersistenceService(mPersistenceService);
 
@@ -108,6 +111,21 @@ Photobook::Photobook(Path localStatePath, Path installationPath,
   mImageToPaperService->configureTaskCruncher(mTaskCruncher);
 }
 
+void Photobook::initLogger()
+{
+  try {
+#ifdef WIN32
+    OneConfig::LOGGER = std::make_shared<spdlog::logger>(
+        "msvc_logger", std::make_shared<spdlog::sinks::msvc_sink_mt>());
+    OneConfig::LOGGER->set_level(spdlog::level::debug);
+    OneConfig::LOGGER->info("Log init succeeded");
+#endif
+  }
+  catch (const spdlog::spdlog_ex &ex) {
+    std::cout << "Log init failed: " << ex.what() << std::endl;
+  }
+}
+
 void Photobook::configure(PhotobookListener *listener) { mParent = listener; }
 
 void Photobook::configure(StagedImagesListener *listener)

diff --git a/PB/tests/TestMain.cpp b/PB/tests/TestMain.cpp
@@ -1,7 +1,19 @@
 #include <gtest/gtest.h>
 
+#include <pb/Config.h>
+
 int main(int argc, char **argv)
 {
+  try {
+    PB::OneConfig::LOGGER = std::make_shared<spdlog::logger>(
+        "console_logger",
+        std::make_shared<spdlog::sinks::stdout_color_sink_mt>());
+    PB::OneConfig::LOGGER->set_level(spdlog::level::debug);
+    PB::OneConfig::LOGGER->info("Log init succeeded");
+  }
+  catch (const spdlog::spdlog_ex &ex) {
+    std::cout << "Log init failed: " << ex.what() << std::endl;
+  }
   ::testing::GTEST_FLAG(filter) = "TestProjectManagementSystem.*";
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();