Merge pull request #1810 from wsw0108/set-logger

add SetLogger to ModelManager

Author: beachtom

src/cpp/web-ifc/modelmanager/ModelManager.cpp

@@ -13,6 +13,7 @@
 
 webifc::manager::ModelManager::ModelManager(bool _mt_enabled)
 {
+    _logger = spdlog::default_logger();
     mt_enabled = _mt_enabled;
 }
 
@@ -34,10 +35,16 @@ void webifc::manager::ModelManager::CloseAllModels()
     _geometryProcessors.clear();
 }
 
+void webifc::manager::ModelManager::SetLogger(std::shared_ptr<spdlog::logger> logger) {
+    _logger = logger;
+}
+
 void webifc::manager::ModelManager::SetLogLevel(uint8_t levelArg)
 {
-    spdlog::set_level((spdlog::level::level_enum)levelArg);
-    spdlog::set_pattern("[WEB-IFC][%l]%v");
+    if (_logger) {
+        _logger->set_level((spdlog::level::level_enum)levelArg);
+        _logger->set_pattern("[WEB-IFC][%l]%v");
+    }
 }
 
 webifc::geometry::IfcGeometryProcessor *webifc::manager::ModelManager::GetGeometryProcessor(uint32_t modelID)
@@ -107,4 +114,4 @@ uint32_t webifc::manager::ModelManager::CreateModel(LoaderSettings settings)
     _loaders.push_back(loader);
     _settings.push_back(settings);
     return _loaders.size() - 1;
-}
+}

src/cpp/web-ifc/modelmanager/ModelManager.h

@@ -7,6 +7,8 @@
 #include "../schema/IfcSchemaManager.h"
 #include "../geometry/IfcGeometryProcessor.h"
 #include "../parsing/IfcLoader.h"
+#include <spdlog/spdlog.h>
+#include <memory>
 #include <vector>
 #include <map>
 #include <optional>
@@ -42,6 +44,7 @@ namespace webifc::manager
         bool IsModelOpen(uint32_t modelID) const;
         void CloseModel(uint32_t modelID);
         uint32_t CreateModel(LoaderSettings settings);
+        void SetLogger(std::shared_ptr<spdlog::logger> logger);
         void SetLogLevel(uint8_t levelArg);
         void CloseAllModels();
 
@@ -50,7 +53,8 @@ namespace webifc::manager
         std::vector<webifc::parsing::IfcLoader *> _loaders;
         std::vector<LoaderSettings> _settings;
         std::map<uint32_t, webifc::geometry::IfcGeometryProcessor *> _geometryProcessors;
+        std::shared_ptr<spdlog::logger> _logger;
         bool header_shown = false;
         bool mt_enabled;
     };
-}
+}