Tweaked logging to streamline access, and simplified setup code for new loggers

1 files changed, 9 insertions, 6 deletions

diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp
index 5782ce582..48eda7512 100644
--- a/zenserver/diag/logging.cpp
+++ b/zenserver/diag/logging.cpp
@@ -211,7 +211,7 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 		spdlog::init_thread_pool(QueueSize, ThreadCount);
 
 		auto AsyncLogger = spdlog::create_async<spdlog::sinks::ansicolor_stdout_sink_mt>("main");
-		spdlog::set_default_logger(AsyncLogger);
+		zen::logging::SetDefault(AsyncLogger);
 	}
 
 	// Sinks
@@ -220,16 +220,16 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 	auto FileSink	 = std::make_shared<spdlog::sinks::basic_file_sink_mt>(zen::WideToUtf8(LogPath.c_str()), /* truncate */ true);
 
 	// Default
-	auto  DefaultLogger = spdlog::default_logger();
-	auto& Sinks			= spdlog::default_logger()->sinks();
-	Sinks.clear();
 
+	auto& DefaultLogger = zen::logging::Default();
+	auto& Sinks			= DefaultLogger.sinks();
+
+	Sinks.clear();
 	Sinks.push_back(ConsoleSink);
 	Sinks.push_back(FileSink);
-	DefaultLogger->set_level(LogLevel);
-	DefaultLogger->flush_on(spdlog::level::err);
 
 	// Jupiter - only log HTTP traffic to file
+
 	auto JupiterLogger = std::make_shared<spdlog::logger>("jupiter", FileSink);
 	spdlog::register_logger(JupiterLogger);
 	JupiterLogger->set_level(LogLevel);
@@ -238,7 +238,10 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 	spdlog::register_logger(ZenClientLogger);
 	ZenClientLogger->set_level(LogLevel);
 
+	// Configure all registered loggers according to settings
+
 	spdlog::set_level(LogLevel);
+	spdlog::flush_on(spdlog::level::err);
 	spdlog::set_formatter(std::make_unique<logging::full_formatter>(GlobalOptions.LogId, std::chrono::system_clock::now()));
 }