From 4c7b28f196697a59c076189970fc4f9cdb491b16 Mon Sep 17 00:00:00 2001 From: EonaCat Date: Fri, 25 Apr 2025 21:33:32 +0200 Subject: [PATCH] Fixed lineBreaks --- .../EonaCatCoreLogger/FileLoggerProvider.cs | 12 +++++++++++- Testers/EonaCat.Logger.Test.Web/Logger.cs | 5 ----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs b/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs index 225e2f2..e6eb455 100644 --- a/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs +++ b/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs @@ -109,7 +109,17 @@ public class FileLoggerProvider : BatchingLoggerProvider var contextInfo = contextData.Count > 0 ? string.Join(" ", contextData.Select(kvp => $"{kvp.Key}={kvp.Value}")) : string.Empty; - return $"[Timestamp: {item.Timestamp:u}] {item.Message} {contextInfo}{Environment.NewLine}"; + + if (!string.IsNullOrWhiteSpace(contextInfo)) + { + // if the message ends with a new line, remove it + if (item.Message.EndsWith(Environment.NewLine)) + { + item.Message = item.Message.Substring(0, item.Message.Length - Environment.NewLine.Length); + } + return $"{item.Message} [{contextInfo}]{Environment.NewLine}"; + } + return $"{item.Message}"; })); if (!_buffer.TryAdd(LogFile, currentMessages)) diff --git a/Testers/EonaCat.Logger.Test.Web/Logger.cs b/Testers/EonaCat.Logger.Test.Web/Logger.cs index 702209b..b68be30 100644 --- a/Testers/EonaCat.Logger.Test.Web/Logger.cs +++ b/Testers/EonaCat.Logger.Test.Web/Logger.cs @@ -41,11 +41,6 @@ public class Logger _logManager = new LogManager(LoggerSettings); _logManager.Settings.TypesToLog.Clear(); _logManager.Settings.LogInfo(); - - while (true) - { - _logManager.WriteAsync("2222", ELogType.INFO, writeToConsole: false); - } } public void DeleteCurrentLogFile()