From 6f00cedfbc96c382e6ccf79ce8243abbe8ebab61 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Tue, 24 Nov 2020 23:16:54 +0100 Subject: [PATCH] Cleanup logger --- openVulkanoCpp/Base/Logger.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openVulkanoCpp/Base/Logger.cpp b/openVulkanoCpp/Base/Logger.cpp index 1b33721..a1a57fc 100644 --- a/openVulkanoCpp/Base/Logger.cpp +++ b/openVulkanoCpp/Base/Logger.cpp @@ -18,6 +18,9 @@ namespace openVulkanoCpp { + constexpr size_t MAX_LOG_FILE_SIZE = 1024 * 1024 * 512; + constexpr size_t MAX_LOG_FILE_COUNT = 3; + std::vector Logger::SINKS; std::vector> Logger::LOGGERS; std::shared_ptr Logger::WINDOW = nullptr; @@ -31,13 +34,12 @@ namespace openVulkanoCpp void Logger::SetupLogger(const std::string& logFolder, const std::string& logFile) { - static bool initialized = false; - if (initialized) return; + if (!SINKS.empty()) return; try { try { //TODO allow log files in folders - SINKS.push_back(std::make_shared(logFile, 1024 * 1024 * 512, 3, true)); + SINKS.push_back(std::make_shared(logFile, MAX_LOG_FILE_SIZE, MAX_LOG_FILE_COUNT, true)); } catch (const spdlog::spdlog_ex& e) { @@ -64,7 +66,6 @@ namespace openVulkanoCpp spdlog::flush_every(std::chrono::seconds(5)); MANAGER->info("Logger initialized"); - initialized = true; } catch (const spdlog::spdlog_ex& e) {