Logging fixes

Properly disable logs on Release build, fixed early logs not being flushed to the file

Author: NicknineTheEagle

src/logging.cpp

@@ -1,6 +1,7 @@
 #include <spdlog/spdlog.h>
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/ringbuffer_sink.h>
+#include <spdlog/sinks/stdout_sinks.h>
 #include <spdlog/cfg/helpers.h>
 
 #include "logging.h"
@@ -14,22 +15,23 @@ void logging::SetupLogger() {
   /* Set log level */
   TCHAR envLogLevel[32767];
   GetEnvironmentVariable("SAFEDISCSHIM_LOGLEVEL", envLogLevel, sizeof(envLogLevel));
-  if ( GetLastError() == ERROR_ENVVAR_NOT_FOUND ) {
+  if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
 #ifdef _DEBUG
     spdlog::set_level(spdlog::level::trace);
 #else
     // don't output logs if envvar is not defined
-    return;
+    spdlog::set_level(spdlog::level::off);
 #endif
   }
   else spdlog::cfg::helpers::load_levels(envLogLevel);
 
   /* Return early if logs are off, so files are not created */
-  if ( spdlog::get_level() == spdlog::level::off )
+  if (spdlog::get_level() == spdlog::level::off)
     return;
 
   /* Log to ringbuffer until we can determine log file name later */
   auto logger = std::make_shared<spdlog::logger>("ringbuffer", ringbufferSink);
+  spdlog::initialize_logger(logger);
   spdlog::set_default_logger(logger);
 
   spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%l] %v");
@@ -40,25 +42,29 @@ void logging::SetupLogger() {
 }
 
 void logging::SetLoggerFileName(const std::string& fileName) {
+  /* Return early if logs are off, so files are not created */
+  if (spdlog::get_level() == spdlog::level::off)
+    return;
+
   try {
     const auto logger = spdlog::basic_logger_mt("file",
       fileName, true);
     spdlog::set_default_logger(logger);
   }
-  catch (const spdlog::spdlog_ex &ex) {
+  catch (const spdlog::spdlog_ex& ex) {
     spdlog::info("Error logging to file ({}), logging to stdout instead.",
       ex.what());
+    const auto logger = spdlog::stdout_logger_mt("stdout");
+    spdlog::set_default_logger(logger);
   }
 
-  // temporarily remove formatting since ringbuffer logs are already formatted
-  spdlog::set_pattern("%v");
-
-  std::vector<std::string> logMessages = ringbufferSink->last_formatted();
+  std::vector<spdlog::details::log_msg_buffer> logMessages = ringbufferSink->last_raw();
 
   // output all logs in buffer to file
-  for (const auto& message : logMessages) {
-    spdlog::info(message);
+  for (const auto sink : spdlog::default_logger()->sinks()) {
+    for (const auto& message : logMessages) {
+      sink->log(message);
+    }
+    sink->flush();
   }
-  // restore formatting
-  spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%l] %v");
 }