performConfig private method added

IntelRealSense · Jan 5, 2021 · 8967923 · 8967923
1 parent d6a53ff
commit 8967923
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/third-party/easyloggingpp/src/easylogging++.cc b/third-party/easyloggingpp/src/easylogging++.cc
@@ -651,24 +651,13 @@ Logger& Logger::operator=(const Logger& logger) {
 void Logger::configure(const Configurations& configurations) {
     if (ELPP && ELPP->asyncLogQueueRead()) {
         base::threading::ScopedLock scopedLockConfig(ELPP->asyncLogQueueRead()->configLock()); 
-        m_isConfigured = false;  // we set it to false in case if we fail
-        initUnflushedCount();
-        if (m_typedConfigurations != nullptr) {
-            Configurations* c = const_cast<Configurations*>(m_typedConfigurations->configurations());
-            if (c->hasConfiguration(Level::Global, ConfigurationType::Filename)) {
-                flush();
-            }
-        }
-        base::threading::ScopedLock scopedLock(lock());
-        if (m_configurations != configurations) {
-            m_configurations.setFromBase(const_cast<Configurations*>(&configurations));
-        }
-        base::utils::safeDelete(m_typedConfigurations);
-        m_typedConfigurations = new base::TypedConfigurations(&m_configurations, m_logStreamsReference);
-        resolveLoggerFormatSpec();
-        m_isConfigured = true;
-        return;
+        performConfig(configurations);
     }
+    else
+        performConfig(configurations);
+}
+
+void Logger::performConfig(const Configurations& configurations) {
     m_isConfigured = false;  // we set it to false in case if we fail
     initUnflushedCount();
     if (m_typedConfigurations != nullptr) {
@@ -685,7 +674,6 @@ void Logger::configure(const Configurations& configurations) {
     m_typedConfigurations = new base::TypedConfigurations(&m_configurations, m_logStreamsReference);
     resolveLoggerFormatSpec();
     m_isConfigured = true;
-    return;  
 }
 
 void Logger::reconfigure(void) {

diff --git a/third-party/easyloggingpp/src/easylogging++.h b/third-party/easyloggingpp/src/easylogging++.h
@@ -2288,6 +2288,8 @@ inline void FUNCTION_NAME(const T&);
 #  undef LOGGER_LEVEL_WRITERS_SIGNATURES
 #endif // ELPP_VARIADIC_TEMPLATES_SUPPORTED
  private:
+  void performConfig(const Configurations& configurations);
+
   std::string m_id;
   base::TypedConfigurations* m_typedConfigurations;
   base::type::stringstream_t m_stream;