diff --git a/EonaCat.Logger/DllInfo.cs b/EonaCat.Logger/DllInfo.cs index c682584..7fa913e 100644 --- a/EonaCat.Logger/DllInfo.cs +++ b/EonaCat.Logger/DllInfo.cs @@ -20,7 +20,7 @@ public static class DllInfo internal static string VersionName { get; } - public static string ApplicationName { get; internal set; } = "EonaCatLogger"; + public static string ApplicationName { get; set; } = "EonaCatLogger"; public static string EonaCatVersion => VersionHelper.GetEonaCatVersion(Assembly.GetExecutingAssembly()); } \ No newline at end of file diff --git a/EonaCat.Logger/EonaCat.Logger.csproj b/EonaCat.Logger/EonaCat.Logger.csproj index 1af008a..4ecf5eb 100644 --- a/EonaCat.Logger/EonaCat.Logger.csproj +++ b/EonaCat.Logger/EonaCat.Logger.csproj @@ -3,7 +3,7 @@ .netstandard2.1; net6.0; net7.0; net8.0; net4.8; icon.ico latest - 1.4.0 + 1.4.1 EonaCat (Jeroen Saey) true EonaCat (Jeroen Saey) @@ -24,7 +24,7 @@ - 1.4.0+{chash:10}.{c:ymd} + 1.4.1+{chash:10}.{c:ymd} true true v[0-9]* diff --git a/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs b/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs index cf26031..cfa66a7 100644 --- a/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs +++ b/EonaCat.Logger/EonaCatCoreLogger/FileLoggerProvider.cs @@ -3,7 +3,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using System.Threading; using System.Threading.Tasks; using EonaCat.Logger.EonaCatCoreLogger.Internal; diff --git a/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerOptions.cs b/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerOptions.cs index 2c0baaa..72df445 100644 --- a/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerOptions.cs +++ b/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerOptions.cs @@ -31,6 +31,8 @@ public class BatchingLoggerOptions /// public int BatchSize { get; set; } = 0; + + /// /// Gets or sets value indicating if logger accepts and queues writes. /// diff --git a/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerProvider.cs b/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerProvider.cs index ff16ab4..ac46b63 100644 --- a/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerProvider.cs +++ b/EonaCat.Logger/EonaCatCoreLogger/Internal/BatchingLoggerProvider.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Diagnostics.SymbolStore; using System.Threading; using System.Threading.Tasks; using EonaCat.Logger.Managers; diff --git a/EonaCat.Logger/Extensions/ExceptionExtensions.cs b/EonaCat.Logger/Extensions/ExceptionExtensions.cs index c254e77..4169a3c 100644 --- a/EonaCat.Logger/Extensions/ExceptionExtensions.cs +++ b/EonaCat.Logger/Extensions/ExceptionExtensions.cs @@ -28,7 +28,7 @@ public static class ExceptionExtensions var sb = new StringBuilder(); sb.AppendLine(); - sb.AppendLine("--- Exception details provided by EonaCatLogger ---"); + sb.AppendLine($"--- Exception details provided by {DllInfo.ApplicationName} ---"); if (!string.IsNullOrEmpty(module)) { sb.AppendLine(" Module : " + module); diff --git a/EonaCat.Logger/Managers/LogHelper.cs b/EonaCat.Logger/Managers/LogHelper.cs index ad2c12f..1f00edd 100644 --- a/EonaCat.Logger/Managers/LogHelper.cs +++ b/EonaCat.Logger/Managers/LogHelper.cs @@ -45,7 +45,13 @@ internal static class LogHelper int severity = (int)logType; int pri = (facility * 8) + severity; string timestamp = dateTime.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); - string syslogMessage = $"<{pri}>1 {timestamp} {hostname} {settings?.Id ?? "EonaCatLogger"} - - {formattedMessage}"; + var syslogMessage = $"<{pri}>1 {timestamp} {hostname} - - {formattedMessage}"; + + if (settings?.Id != null) + { + syslogMessage = $"<{pri}>1 {timestamp} {hostname} {settings?.Id} - - {formattedMessage}"; + } + syslogMessage = $"<{pri}>1 {timestamp} {hostname} - - {formattedMessage}"; return syslogMessage; } @@ -63,7 +69,7 @@ internal static class LogHelper int severity = (int)logType; int pri = (facility * 8) + severity; string timestamp = dateTime.ToString("MMM dd HH:mm:ss"); - string syslogMessage = $"<{pri}>{timestamp} {hostname} {settings?.Id ?? "EonaCatLogger"}: {formattedMessage}"; + string syslogMessage = $"<{pri}>{timestamp} {hostname} {settings?.Id ?? DllInfo.ApplicationName}: {formattedMessage}"; return syslogMessage; } @@ -77,7 +83,7 @@ internal static class LogHelper } category ??= "General"; - var sb = new StringBuilder(settings?.HeaderFormat ?? "[EonaCatLogger]"); + var sb = new StringBuilder(settings?.HeaderFormat); var timestamp = dateTime.ToString(settings?.TimestampFormat ?? "yyyy-MM-dd HH:mm:ss"); var timeLabel = settings?.UseLocalTime ?? false ? "[LOCAL]" : "[UTC]"; @@ -87,11 +93,6 @@ internal static class LogHelper .Replace("{thread}", $"[ThreadId:{Environment.CurrentManagedThreadId}]") .Replace("{sev}", $"[{logType}]"); - if (!(settings?.RemoveMessagePrefix ?? false) && !currentMessage.Contains("[EonaCatLogger]")) - { - sb.Insert(0, "[EonaCatLogger] "); - } - if (sb.Length > 0) { sb.Append(" "); diff --git a/EonaCat.Logger/Managers/LogManager.cs b/EonaCat.Logger/Managers/LogManager.cs index 6cf62da..113a8ae 100644 --- a/EonaCat.Logger/Managers/LogManager.cs +++ b/EonaCat.Logger/Managers/LogManager.cs @@ -121,7 +121,7 @@ namespace EonaCat.Logger.Managers { var settings = new LoggerSettings { - Id = "EonaCatLogger", + Id = DllInfo.ApplicationName, }; return settings; } @@ -291,15 +291,9 @@ namespace EonaCat.Logger.Managers private void SetupLogManager() { - AppDomain.CurrentDomain.ProcessExit += ProcessExit; _logDate = CurrentDateTime; } - private void ProcessExit(object sender, EventArgs e) - { - Dispose(); - } - private Task StopLoggingAsync() { WriteStopMessage(); diff --git a/EonaCat.Logger/Managers/LoggerSettings.cs b/EonaCat.Logger/Managers/LoggerSettings.cs index 5ee3219..accdb41 100644 --- a/EonaCat.Logger/Managers/LoggerSettings.cs +++ b/EonaCat.Logger/Managers/LoggerSettings.cs @@ -30,13 +30,7 @@ public class LoggerSettings /// public bool UseLocalTime { get; set; } - public string Id { get; set; } = "EonaCatLogger"; - - /// - /// Determines if we need to remove the prefix [EonaCatLogger] from each message (default: false) - /// - public bool RemoveMessagePrefix { get; set; } - + public string Id { get; set; } = DllInfo.ApplicationName; /// /// Header format. Provide a string that specifies how the preamble of each message should be structured. You can use diff --git a/README.md b/README.md index 91fb929..6e58a1a 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ namespace EonaCat.Logger.Advanced static Logger() { // Create and configure a LogManager for logging. - _logManager = new LogManager(new LoggerSettings { RemoveMessagePrefix = true }); + _logManager = new LogManager(new LoggerSettings()); _logManager.OnException += _logManager_OnException; _logManager.OnLogLevelDisabled += _logManager_OnLogLevelDisabled; _logManager.Settings.FileLoggerOptions.FileNamePrefix = "advanced"; diff --git a/Testers/EonaCat.Logger.Test.Web/Logger.cs b/Testers/EonaCat.Logger.Test.Web/Logger.cs index 2ab94db..fd5ddf3 100644 --- a/Testers/EonaCat.Logger.Test.Web/Logger.cs +++ b/Testers/EonaCat.Logger.Test.Web/Logger.cs @@ -114,7 +114,7 @@ public class Logger if (fS.Length > limit) { - await stream.WriteAsync("\r\n####__EONACATLOGGER_TRUNCATED___####"u8.ToArray()).ConfigureAwait(false); + await stream.WriteAsync("\r\n####___TRUNCATED___####"u8.ToArray()).ConfigureAwait(false); } } } diff --git a/Testers/EonaCat.Logger.Test.Web/Program.cs b/Testers/EonaCat.Logger.Test.Web/Program.cs index c869bff..2f2127a 100644 --- a/Testers/EonaCat.Logger.Test.Web/Program.cs +++ b/Testers/EonaCat.Logger.Test.Web/Program.cs @@ -18,13 +18,14 @@ var defaultColor = Console.ForegroundColor; // Add services to the container. Logger logger = new Logger(); logger.UseLocalTime = true; -logger.TypesToLog.Add(ELogType.INFO); -logger.TypesToLog.Add(ELogType.WARNING); -logger.TypesToLog.Add(ELogType.ERROR); -logger.TypesToLog.Add(ELogType.CRITICAL); -logger.TypesToLog.Add(ELogType.DEBUG); -logger.TypesToLog.Add(ELogType.TRACE); -logger.TypesToLog.Add(ELogType.TRAFFIC); +logger.LoggerSettings.Id = "TEST"; +logger.LoggerSettings.LogInfo(); +logger.LoggerSettings.LogWarning(); +logger.LoggerSettings.LogError(); +logger.LoggerSettings.LogCritical(); +logger.LoggerSettings.LogDebug(); +logger.LoggerSettings.LogTrace(); +logger.LoggerSettings.LogTraffic(); logger.LoggerSettings.OnLog += LoggerSettings_OnLog; logger.LoggerSettings.UseMask = true; @@ -42,7 +43,7 @@ var options = new FileLoggerOptions(); options.MaxRolloverFiles = 5; //options.FileSizeLimit = 1 * 1024 * 1024 / 4; options.UseLocalTime = true; -options.UseMask = true; +options.UseMask = true; builder.Logging.AddEonaCatFileLogger(fileLoggerOptions: options, filenamePrefix: "web"); builder.Services.AddRazorPages(); @@ -125,6 +126,7 @@ void RunLoggingExceptionTests() var loggerSettings = new LoggerSettings(); loggerSettings.FileLoggerOptions.UseLocalTime = true; loggerSettings.UseLocalTime = true; + loggerSettings.Id = "TEST"; loggerSettings.TypesToLog.Add(ELogType.INFO); var logger = new LogManager(loggerSettings); @@ -219,6 +221,7 @@ async void RunMaskTest() async Task RunLoggingTestsAsync() { var loggerSettings = new LoggerSettings(); + loggerSettings.Id = "TEST"; loggerSettings.UseLocalTime = true; loggerSettings.FileLoggerOptions.UseLocalTime = true; loggerSettings.TypesToLog.Add(ELogType.INFO);