Fixed crash in logger.

Author: shajen

sources/logger.cpp

@@ -7,26 +7,24 @@
 
 void Logger::Logger::configure(
     const spdlog::level::level_enum logLevelConsole, const spdlog::level::level_enum logLevelFile, const std::string& logFile, int fileSize, int filesCount, bool isColorLogEnabled) {
-  spdlog::drop_all();
-  _logger.reset();
+  std::shared_ptr<spdlog::logger> logger = std::make_shared<spdlog::logger>("auto_sdr");
 
-  auto consoleLogger = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
-  consoleLogger->set_level(logLevelConsole);
+  if (logLevelConsole != spdlog::level::off) {
+    auto consoleLogger = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    consoleLogger->set_level(logLevelConsole);
+    logger->sinks().push_back(consoleLogger);
+  }
 
-  if (logLevelFile == spdlog::level::off || logFile.empty()) {
-    std::initializer_list<spdlog::sink_ptr> loggers{consoleLogger};
-    Logger::_logger = std::make_shared<spdlog::logger>("auto_sdr", loggers);
-  } else {
+  if (logLevelFile != spdlog::level::off && !logFile.empty() && 0 < fileSize && 0 < filesCount) {
     auto fileLogger = std::make_shared<spdlog::sinks::rotating_file_sink_mt>(logFile, fileSize, filesCount);
     fileLogger->set_level(logLevelFile);
-
-    std::initializer_list<spdlog::sink_ptr> loggers{consoleLogger, fileLogger};
-    Logger::_logger = std::make_shared<spdlog::logger>("auto_sdr", loggers);
+    logger->sinks().push_back(fileLogger);
   }
 
-  _logger->set_level(std::min(logLevelConsole, logLevelFile));
-  _logger->set_pattern("[%Y-%m-%d %H:%M:%S.%f] [%-7l] %v");
-  spdlog::register_logger(_logger);
-  spdlog::flush_every(std::chrono::seconds(10));
-  _isColorLogEnabled = isColorLogEnabled;
+  isColorLogEnabled = isColorLogEnabled;
+  logger->set_level(std::min(logLevelConsole, logLevelFile));
+  logger->set_pattern("[%Y-%m-%d %H:%M:%S.%f] [%-7l] %v");
+  spdlog::flush_every(std::chrono::seconds(30));
+  spdlog::flush_on(spdlog::level::warn);
+  spdlog::set_default_logger(logger);
 }

sources/logger.h

@@ -24,47 +24,45 @@ class Logger {
   template <typename... Args>
   static void trace(const char* label, fmt::format_string<Args...> fmt, Args&&... args) {
     auto msg = fmt::format(fmt, std::forward<Args>(args)...);
-    Logger::_logger->trace("[{:12}] {}", label, msg);
+    spdlog::trace("[{:12}] {}", label, msg);
   }
 
   template <typename... Args>
   static void debug(const char* label, fmt::format_string<Args...> fmt, Args&&... args) {
     auto msg = fmt::format(fmt, std::forward<Args>(args)...);
-    Logger::_logger->debug("[{:12}] {}", label, msg);
+    spdlog::debug("[{:12}] {}", label, msg);
   }
 
   template <typename... Args>
   static void info(const char* label, fmt::format_string<Args...> fmt, Args&&... args) {
     auto msg = fmt::format(fmt, std::forward<Args>(args)...);
-    Logger::_logger->info("[{:12}] {}", label, msg);
+    spdlog::info("[{:12}] {}", label, msg);
   }
 
   template <typename... Args>
   static void warn(const char* label, fmt::format_string<Args...> fmt, Args&&... args) {
     auto msg = fmt::format(fmt, std::forward<Args>(args)...);
-    Logger::_logger->warn("[{:12}] {}", label, msg);
+    spdlog::warn("[{:12}] {}", label, msg);
   }
 
   template <typename... Args>
   static void error(const char* label, fmt::format_string<Args...> fmt, Args&&... args) {
     auto msg = fmt::format(fmt, std::forward<Args>(args)...);
-    Logger::_logger->error("[{:12}] {}", label, msg);
+    spdlog::error("[{:12}] {}", label, msg);
   }
 
   template <typename... Args>
   static void critical(const char* label, fmt::format_string<Args...> fmt, Args&&... args) {
     auto msg = fmt::format(fmt, std::forward<Args>(args)...);
-    Logger::_logger->critical("[{:12}] {}", label, msg);
+    spdlog::critical("[{:12}] {}", label, msg);
   }
 
-  static void flush() { Logger::_logger->flush(); }
   static bool isColorLogEnabled() { return _isColorLogEnabled; }
 
  private:
   Logger() = delete;
   ~Logger() = delete;
 
-  inline static std::shared_ptr<spdlog::logger> _logger = nullptr;
   inline static bool _isColorLogEnabled = true;
 };
 

sources/radio/blocks/sdr_source.cpp

@@ -36,7 +36,6 @@ int SdrSource::work(int noutput_items, gr_vector_const_void_star&, gr_vector_voi
     return result;
   } else {
     Logger::error(LABEL, "soapy error: {}", SoapySDR::errToStr(result));
-    Logger::flush();
     exit(1);
     return 0;
   }