move back to one log file

R2Northstar · Jan 18, 2024 · d4c6a55 · d4c6a55
1 parent 9e9b918
commit d4c6a55
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 36 deletions.
diff --git a/primedev/dllmain.cpp b/primedev/dllmain.cpp
@@ -44,7 +44,7 @@ bool InitialiseNorthstar()
 	InitialiseNorthstarPrefix();
 
 	// Initilaze log directory
-	g_svLogDirectory = fmt::format("{:s}\\logs\\{:s}", GetNorthstarPrefix(), CreateTimeStamp());
+	g_svLogDirectory = fmt::format("{:s}\\logs", GetNorthstarPrefix());
 
 	// Checks if we can write into install directory
 	SpdLog_PreInit();

diff --git a/primedev/logging/dbg.cpp b/primedev/logging/dbg.cpp
@@ -75,31 +75,6 @@ Color Log_GetColor(eLog eContext, eLogLevel eLevel)
 	return Color(255, 255, 255);
 }
 
-//-----------------------------------------------------------------------------
-// Purpose: Get logger based on the log level
-// Input  : eLevel -
-// Output : Smart pointer to the logger
-//-----------------------------------------------------------------------------
-std::shared_ptr<spdlog::logger> Log_GetLogger(eLogLevel eLevel)
-{
-	std::string svName;
-
-	switch (eLevel)
-	{
-	case eLogLevel::LOG_INFO:
-		svName = "northstar(info)";
-		break;
-	case eLogLevel::LOG_WARN:
-		svName = "northstar(warning)";
-		break;
-	case eLogLevel::LOG_ERROR:
-		svName = "northstar(error)";
-		break;
-	}
-
-	return spdlog::get(svName);
-}
-
 //-----------------------------------------------------------------------------
 // Purpose: Prints to all outputs based on parameters, va_list version
 // Input  : eContext -
@@ -139,7 +114,7 @@ void CoreMsgV(eLog eContext, eLogLevel eLevel, const int iCode, const char* pszN
 	svMessage = std::regex_replace(svMessage, AnsiRegex, "");
 
 	// Log to file
-	std::shared_ptr<spdlog::logger> pLogger = Log_GetLogger(eLevel);
+	auto pLogger = spdlog::get("northstar");
 	if (pLogger.get()) // "-nologfiles" or programmer error can cause this to fail
 		pLogger->info("{:s}", svMessage);
 

diff --git a/primedev/logging/logging.cpp b/primedev/logging/logging.cpp
@@ -90,15 +90,14 @@ void SpdLog_CreateLoggers(void)
 	if (!g_bSpdLog_CreateLogFiles)
 		return;
 
-	spdlog::rotating_logger_mt<spdlog::synchronous_factory>(
-		"northstar(info)", fmt::format("{:s}\\{:s}", g_svLogDirectory, "message.txt"), SPDLOG_MAX_LOG_SIZE, SPDLOG_MAX_FILES)
-		->set_pattern("[%Y-%m-%d %H:%M:%S.%e] %v");
-	spdlog::rotating_logger_mt<spdlog::synchronous_factory>(
-		"northstar(warning)", fmt::format("{:s}\\{:s}", g_svLogDirectory, "warning.txt"), SPDLOG_MAX_LOG_SIZE, SPDLOG_MAX_FILES)
-		->set_pattern("[%Y-%m-%d %H:%M:%S.%e] %v");
-	spdlog::rotating_logger_mt<spdlog::synchronous_factory>(
-		"northstar(error)", fmt::format("{:s}\\{:s}", g_svLogDirectory, "error.txt"), SPDLOG_MAX_LOG_SIZE, SPDLOG_MAX_FILES)
-		->set_pattern("[%Y-%m-%d %H:%M:%S.%e] %v");
+	time_t time = std::time(nullptr);
+	tm currentTime = *std::localtime(&time);
+
+	std::stringstream stream;
+	stream << g_svLogDirectory << std::put_time(&currentTime, "\\nslog%Y-%m-%d %H-%M-%S.txt");
+
+	auto logger = spdlog::basic_logger_mt("northstar", stream.str());
+	logger->set_pattern("[%Y-%m-%d] [%H:%M:%S] [%l] %v");
 }
 
 //-----------------------------------------------------------------------------