diff --git a/EonaCat.Logger/EonaCat.Logger.csproj b/EonaCat.Logger/EonaCat.Logger.csproj index 93c0780..748eee2 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.2.7 + 1.2.8 EonaCat (Jeroen Saey) true EonaCat (Jeroen Saey) @@ -24,7 +24,7 @@ - 1.2.7+{chash:10}.{c:ymd} + 1.2.8+{chash:10}.{c:ymd} true true v[0-9]* diff --git a/EonaCat.Logger/Managers/LogHelper.cs b/EonaCat.Logger/Managers/LogHelper.cs index 5e766e9..4db0566 100644 --- a/EonaCat.Logger/Managers/LogHelper.cs +++ b/EonaCat.Logger/Managers/LogHelper.cs @@ -120,7 +120,7 @@ internal static class LogHelper private static bool IsLogLevelEnabled(LoggerSettings settings, ELogType logType) { - return settings.MinLogType != ELogType.NONE && settings.MinLogType >= logType; + return settings.MaxLogType != ELogType.NONE && logType <= settings.MaxLogType; } private static void Log(ILogger logger, LogLevel logLevel, string message) diff --git a/EonaCat.Logger/Managers/LogManager.cs b/EonaCat.Logger/Managers/LogManager.cs index 2d6d359..14a7ea7 100644 --- a/EonaCat.Logger/Managers/LogManager.cs +++ b/EonaCat.Logger/Managers/LogManager.cs @@ -107,7 +107,7 @@ public class LogManager : ILogManager, IDisposable { var settings = new LoggerSettings(); settings.Id = "EonaCatLogger"; - settings.MinLogType = ELogType.INFO; + settings.MaxLogType = ELogType.INFO; return settings; } @@ -138,7 +138,7 @@ public class LogManager : ILogManager, IDisposable LoggerFactory?.Dispose(); IServiceCollection serviceCollection = new ServiceCollection(); - serviceCollection.AddLogging(builder => builder.SetMinimumLevel(Settings.MinLogType.ToLogLevel()) + serviceCollection.AddLogging(builder => builder.SetMinimumLevel(Settings.MaxLogType.ToLogLevel()) .AddEonaCatFileLogger(configuration => { var fileLoggerOptions = Settings.FileLoggerOptions; @@ -167,7 +167,7 @@ public class LogManager : ILogManager, IDisposable string grayLogSource = null, string grayLogVersion = "1.1") { if (string.IsNullOrEmpty(message) || logType == ELogType.NONE || - (int)logType < (int)Settings.MinLogType) return; + (int)logType > (int)Settings.MaxLogType) return; var messageWithHeader = LogHelper.FormatMessageWithHeader(Settings, logType, message, dateTime); var writeToConsoleValue = writeToConsole ?? Settings.EnableConsole; diff --git a/EonaCat.Logger/Managers/LoggerSettings.cs b/EonaCat.Logger/Managers/LoggerSettings.cs index 5ffb40c..6080476 100644 --- a/EonaCat.Logger/Managers/LoggerSettings.cs +++ b/EonaCat.Logger/Managers/LoggerSettings.cs @@ -104,7 +104,7 @@ public class LoggerSettings } } - public ELogType MinLogType { get; set; } = ELogType.INFO; + public ELogType MaxLogType { get; set; } = ELogType.INFO; public bool SendToSyslogServers { get; set; } diff --git a/Testers/EonaCat.Logger.Test.Web/Logger.cs b/Testers/EonaCat.Logger.Test.Web/Logger.cs index 7c63b29..0e35cd0 100644 --- a/Testers/EonaCat.Logger.Test.Web/Logger.cs +++ b/Testers/EonaCat.Logger.Test.Web/Logger.cs @@ -8,7 +8,7 @@ namespace EonaCat.Logger.Test.Web; public static class Logger { private static LogManager LogManager; - public static ELogType MinLogType { get; set; } + public static ELogType MaxLogType { get; set; } public static bool UseLocalTime { get; set; } public static string LogFolder => Path.Combine(FileLoggerOptions.DefaultPath, "logs"); public static string CurrentLogFile => LogManager.CurrentLogFile; @@ -98,7 +98,10 @@ public static class Logger if (IsDisabled) return; - LogManager.Write(exception, message, writeToConsole: writeToConsole); + if (ELogType.ERROR <= MaxLogType) + { + LogManager.Write(exception, message, writeToConsole: writeToConsole); + } } public static void Configure() @@ -106,7 +109,7 @@ public static class Logger var loggerSettings = new LoggerSettings { Id = "EonaCatTestLogger", - MinLogType = ELogType.INFO, + MaxLogType = ELogType.INFO, UseLocalTime = UseLocalTime, FileLoggerOptions = { diff --git a/Testers/EonaCat.Logger.Test.Web/Program.cs b/Testers/EonaCat.Logger.Test.Web/Program.cs index b27e8bd..52884fb 100644 --- a/Testers/EonaCat.Logger.Test.Web/Program.cs +++ b/Testers/EonaCat.Logger.Test.Web/Program.cs @@ -62,7 +62,7 @@ builder.Services.AddMemoryCache(); var app = builder.Build(); Logger.UseLocalTime = true; -Logger.MinLogType = ELogType.TRACE; +Logger.MaxLogType = ELogType.TRACE; Logger.Configure(); // Configure the HTTP request pipeline. @@ -105,7 +105,7 @@ void RunLoggingExceptionTests() var loggerSettings = new LoggerSettings(); loggerSettings.FileLoggerOptions.UseLocalTime = true; loggerSettings.UseLocalTime = true; - loggerSettings.MinLogType = ELogType.INFO; + loggerSettings.MaxLogType = ELogType.INFO; var logger = new LogManager(loggerSettings); for (var i = 0; i < 10; i++) @@ -171,7 +171,7 @@ void RunLoggingTests() var loggerSettings = new LoggerSettings(); loggerSettings.UseLocalTime = true; loggerSettings.FileLoggerOptions.UseLocalTime = true; - loggerSettings.MinLogType = ELogType.INFO; + loggerSettings.MaxLogType = ELogType.INFO; loggerSettings.FileLoggerOptions.FileSizeLimit = 1024 * 1024 * 1; loggerSettings.FileLoggerOptions.FileNamePrefix = "AllTypes"; loggerSettings.FileLoggerOptions.MaxRolloverFiles = 5;