Fix startup

Yadoms · Sep 3, 2024 · 1cb325b · 1cb325b
1 parent 8f53029
commit 1cb325b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/sources/server/Application.cpp b/sources/server/Application.cpp
@@ -54,7 +54,8 @@ void CYadomsServer::initialize(Application& self)
    current_path(workingDir.parent_path());
 
    m_pathProvider = boost::make_shared<CPathProvider>(m_startupOptions);
-   logging::CLogConfiguration::configure(m_startupOptions->getLogLevel(), m_pathProvider->logsPath());
+   m_logConfiguration = boost::make_shared<logging::CLogConfiguration>(m_startupOptions->getLogLevel(),
+                                                                       m_pathProvider->logsPath());
 
    //define proxy settings as earlier possible
    setupProxy();

diff --git a/sources/server/Application.h b/sources/server/Application.h
@@ -3,6 +3,7 @@
 #include "startupOptions/StartupOptions.h"
 #include "IRunningInformation.h"
 #include "IPathProvider.h"
+#include "logging/LogConfiguration.h"
 
 
 //-----------------------------
@@ -52,4 +53,9 @@ class CYadomsServer final : public Poco::Util::ServerApplication
    ///\brief Running information
    //-----------------------------
    boost::shared_ptr<IRunningInformation> m_runningInformation;
+
+   //-----------------------------
+   ///\brief Log configuration
+   //-----------------------------
+   boost::shared_ptr<logging::CLogConfiguration> m_logConfiguration;
 };
diff --git a/sources/server/logging/LogConfiguration.cpp b/sources/server/logging/LogConfiguration.cpp
@@ -4,15 +4,11 @@
 
 namespace logging
 {
-   //declare static PImpl configurator
-   boost::shared_ptr<CLogConfigurationImpl> CLogConfiguration::m_configurator(boost::make_shared<CLogConfigurationImpl>());
-
-   void CLogConfiguration::configure(const std::string& logLevel,
-                                     const boost::filesystem::path& logPath)
+   CLogConfiguration::CLogConfiguration(const std::string& logLevel,
+                                        const boost::filesystem::path& logPath)
+      : m_configurator(boost::make_shared<CLogConfigurationImpl>())
    {
       m_configurator->configure(logLevel,
                                 logPath);
    }
 } // namespace logging
-
-
diff --git a/sources/server/logging/LogConfiguration.h b/sources/server/logging/LogConfiguration.h
@@ -6,24 +6,14 @@ namespace logging
    //--------------------------------------------------------------
    /// \brief     Class used to configure the logger
    //--------------------------------------------------------------
-   class CLogConfiguration
+   class CLogConfiguration final
    {
    public:
-
-      //--------------------------------------------------------------
-      /// \brief	                  configure the logger with one file per thread without rolling on size
-      /// \param[in]  logLevel      The log level
-      /// \param[in]  logPath       The log path
-      //--------------------------------------------------------------
-      static void configure(const std::string& logLevel,
-                            const boost::filesystem::path& logPath);
+      explicit CLogConfiguration(const std::string& logLevel,
+                                 const boost::filesystem::path& logPath);
+      ~CLogConfiguration() = default;
 
    private:
-      //--------------------------------------------------------------
-      /// \brief     Private impelmentation
-      //--------------------------------------------------------------
-      static boost::shared_ptr<CLogConfigurationImpl> m_configurator;
+      boost::shared_ptr<CLogConfigurationImpl> m_configurator;
    };
 } // namespace logging
-
-