replace logger with spdlog

Author: 7bitcoder

Include/Common/Logger.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <memory>
+#include <spdlog/logger.h>
+#include <spdlog/spdlog.h>
+
+namespace sb
+{
+    using Logger = spdlog::logger;
+    using LoggerSPtr = std::shared_ptr<Logger>;
+    using LoggerPtr = std::unique_ptr<Logger>;
+
+    using LoggerSink = spdlog::sinks::sink;
+    using LoggerSinkSPtr = std::shared_ptr<LoggerSink>;
+    using LoggerSinkPtr = std::unique_ptr<LoggerSink>;
+
+    using LogLevel = spdlog::level::level_enum;
+} // namespace sb

Include/Engine/EngineDependencies.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "SevenBit/DI.hpp"
-#include "SevenBit/Conf.hpp"
-#include "Log/ILogger.hpp"
+#include "Common/Logger.hpp"
 #include "Router/IRouter.hpp"
 #include "Services/IEnvironment.hpp"
 #include "Services/IServerSettingsProvider.hpp"
+#include "SevenBit/Conf.hpp"
+#include "SevenBit/DI.hpp"
 
 namespace sb
 {
@@ -19,7 +19,7 @@ namespace sb
 
         cf::IConfiguration &_configuration = _serviceProvider.getService<cf::IConfiguration>();
         IEnvironment &_environment = _serviceProvider.getService<IEnvironment>();
-        ILogger &_logger = _serviceProvider.getService<ILogger>();
+        Logger &_logger = _serviceProvider.getService<Logger>();
 
         IServerSettingsProvider &_settingProvider = _serviceProvider.getService<IServerSettingsProvider>();
 
@@ -40,7 +40,7 @@ namespace sb
 
         IEnvironment &getEnvironment() { return _environment; }
 
-        ILogger &getLogger() { return _logger; }
+        Logger &getLogger() { return _logger; }
 
         IServerSettingsProvider &getSettingsProvider() { return _settingProvider; }
 

Include/Engine/IWebApplicationEngine.hpp

@@ -5,15 +5,15 @@
 #include <typeindex>
 
 #include "Common/Export.hpp"
-#include "SevenBit/Conf.hpp"
-#include "SevenBit/DI.hpp"
+#include "Common/Logger.hpp"
 #include "Engine/Action.hpp"
 #include "Engine/EngineDependencies.hpp"
 #include "Engine/IEndpoint.hpp"
-#include "Log/ILogger.hpp"
 #include "Middlewares/MiddlewareCreator.hpp"
 #include "Router/IRouter.hpp"
 #include "Services/IEnvironment.hpp"
+#include "SevenBit/Conf.hpp"
+#include "SevenBit/DI.hpp"
 
 namespace sb
 {
@@ -43,7 +43,7 @@ namespace sb
 
         virtual const IEnvironment &getEnvironment() = 0;
 
-        virtual ILogger &getLogger() = 0;
+        virtual Logger &getLogger() = 0;
 
         virtual di::ServiceProvider &getServiceProvider() = 0;
 

Include/Engine/LoggingBuilder.hpp

@@ -0,0 +1,31 @@
+#pragma once
+#include <spdlog/sinks/sink.h>
+#include <spdlog/spdlog.h>
+#include <string_view>
+
+#include "Common/Logger.hpp"
+#include "SevenBit/DI.hpp"
+
+namespace sb
+{
+    class LoggingBuilder final
+    {
+      private:
+        di::ServiceCollection _logProviders;
+
+      public:
+        using Ptr = std::unique_ptr<LoggingBuilder>;
+
+        di::ServiceCollection &getServices() { return _logProviders; }
+
+        void clearProviders() { getServices().removeAll<LoggerSink>(); }
+
+        template <class F> void add(F &&factory) { getServices().addTransient<LoggerSink>(std::forward<F>(factory)); }
+
+        template <class T> void add() { getServices().addSingleton<LoggerSink, T>(); }
+
+        template <class T> bool contains() { return getServices().contains<LoggerSink, T>(); }
+
+        template <class T> bool remove() { return getServices().remove<LoggerSink, T>(); }
+    };
+} // namespace sb

Include/Engine/WebApplication.hpp

@@ -6,8 +6,6 @@
 #include <tao/json/forward.hpp>
 
 #include "Common/Utils.hpp"
-#include "SevenBit/DI.hpp"
-#include "SevenBit/Conf.hpp"
 #include "Engine/FromBody.hpp"
 #include "Engine/FromHeader.hpp"
 #include "Engine/FromQuery.hpp"
@@ -30,6 +28,8 @@
 #include "Router/IRouter.hpp"
 #include "Services/Environment.hpp"
 #include "Services/IContextAccessor.hpp"
+#include "SevenBit/Conf.hpp"
+#include "SevenBit/DI.hpp"
 
 namespace sb
 {
@@ -109,7 +109,7 @@ namespace sb
 
         const IEnvironment &getEnvironment() { return _engine->getEnvironment(); }
 
-        ILogger &getLogger() { return _engine->getLogger(); }
+        Logger &getLogger() { return _engine->getLogger(); }
 
         di::ServiceProvider &getServiceProvider() { return _engine->getServiceProvider(); }
 

Include/Engine/WebApplicationBuilder.hpp

@@ -17,14 +17,13 @@
 #include "Common/ConfigurationManager.hpp"
 #include "Common/EnvVariables.hpp"
 #include "Common/Json.hpp"
+#include "Common/Logger.hpp"
 #include "Common/ServerSettings.hpp"
 #include "Common/Utils.hpp"
 #include "Engine/EnvironmentBuilder.hpp"
+#include "Engine/LoggingBuilder.hpp"
 #include "Engine/WebApplication.hpp"
 #include "Engine/WebApplicationOptions.hpp"
-#include "Log/ConsoleLogProvider.hpp"
-#include "Log/Logger.hpp"
-#include "Log/LoggingBuilder.hpp"
 #include "Router/Router.hpp"
 #include "Services/Environment.hpp"
 #include "Services/IEnvironment.hpp"
@@ -164,10 +163,9 @@ namespace sb
             _configuration->addEnvironmentVariables(options.environmentPrefix);
             _configuration->addCommandLine(options.argc, options.argv);
 
-            _loggingBuilder->add<ConsoleLogProvider>();
-            _loggingBuilder->addSpdlog([]() {
+            _loggingBuilder->add([]() -> LoggerSinkPtr {
                 auto consoleSink = std::make_unique<spdlog::sinks::stdout_color_sink_mt>();
-                consoleSink->set_level(spdlog::level::warn);
+                consoleSink->set_level(LogLevel::trace);
                 return consoleSink;
             });
         }
@@ -190,12 +188,12 @@ namespace sb
                 });
 
             _serviceCollection->add(_loggingBuilder->getServices());
-            _serviceCollection->addSingleton([](std::vector<std::unique_ptr<spdlog::sinks::sink>> sinks) {
-                auto map = [](auto &sink) -> std::shared_ptr<spdlog::sinks::sink> { return std::move(sink); };
+
+            _serviceCollection->addSingleton([](std::vector<LoggerSinkPtr> sinks) {
+                auto map = [](auto &sink) -> std::shared_ptr<LoggerSink> { return std::move(sink); };
                 auto view = sinks | std::views::transform(map);
-                return spdlog::logger{"", view.begin(), view.end()};
+                return Logger{"", view.begin(), view.end()};
             });
-            _serviceCollection->addSingleton<ILogger, Logger>();
         }
     };
 }; // namespace sb