EonaCat/EonaCat.Logger
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated

Browse Source
This commit is contained in:
EonaCat
2024-04-27 11:10:01 +02:00
parent 1038a6fdee
commit 1a2838a796
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EonaCat.Logger/EonaCat.Logger.csproj
View File

@@ -3,7 +3,7 @@
<TargetFrameworks>.netstandard2.1; net6.0; net7.0; net8.0; net4.8;</TargetFrameworks> <TargetFrameworks>.netstandard2.1; net6.0; net7.0; net8.0; net4.8;</TargetFrameworks>
<ApplicationIcon>icon.ico</ApplicationIcon> <ApplicationIcon>icon.ico</ApplicationIcon>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<FileVersion>1.2.7</FileVersion> <FileVersion>1.2.8</FileVersion>
<Authors>EonaCat (Jeroen Saey)</Authors> <Authors>EonaCat (Jeroen Saey)</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company>EonaCat (Jeroen Saey)</Company> <Company>EonaCat (Jeroen Saey)</Company>
@@ -24,7 +24,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<EVRevisionFormat>1.2.7+{chash:10}.{c:ymd}</EVRevisionFormat> <EVRevisionFormat>1.2.8+{chash:10}.{c:ymd}</EVRevisionFormat>
<EVDefault>true</EVDefault> <EVDefault>true</EVDefault>
<EVInfo>true</EVInfo> <EVInfo>true</EVInfo>
<EVTagMatch>v[0-9]*</EVTagMatch> <EVTagMatch>v[0-9]*</EVTagMatch>

2
EonaCat.Logger/Managers/LogHelper.cs
View File

@@ -120,7 +120,7 @@ internal static class LogHelper
private static bool IsLogLevelEnabled(LoggerSettings settings, ELogType logType) 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) private static void Log(ILogger logger, LogLevel logLevel, string message)

6
EonaCat.Logger/Managers/LogManager.cs
View File

@@ -107,7 +107,7 @@ public class LogManager : ILogManager, IDisposable
{ {
var settings = new LoggerSettings(); var settings = new LoggerSettings();
settings.Id = "EonaCatLogger"; settings.Id = "EonaCatLogger";
settings.MinLogType = ELogType.INFO; settings.MaxLogType = ELogType.INFO;
return settings; return settings;
} }
@@ -138,7 +138,7 @@ public class LogManager : ILogManager, IDisposable
LoggerFactory?.Dispose(); LoggerFactory?.Dispose();
IServiceCollection serviceCollection = new ServiceCollection(); IServiceCollection serviceCollection = new ServiceCollection();
serviceCollection.AddLogging(builder => builder.SetMinimumLevel(Settings.MinLogType.ToLogLevel()) serviceCollection.AddLogging(builder => builder.SetMinimumLevel(Settings.MaxLogType.ToLogLevel())
.AddEonaCatFileLogger(configuration => .AddEonaCatFileLogger(configuration =>
{ {
var fileLoggerOptions = Settings.FileLoggerOptions; var fileLoggerOptions = Settings.FileLoggerOptions;
@@ -167,7 +167,7 @@ public class LogManager : ILogManager, IDisposable
string grayLogSource = null, string grayLogVersion = "1.1") string grayLogSource = null, string grayLogVersion = "1.1")
{ {
if (string.IsNullOrEmpty(message) || logType == ELogType.NONE || 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 messageWithHeader = LogHelper.FormatMessageWithHeader(Settings, logType, message, dateTime);
var writeToConsoleValue = writeToConsole ?? Settings.EnableConsole; var writeToConsoleValue = writeToConsole ?? Settings.EnableConsole;

2
EonaCat.Logger/Managers/LoggerSettings.cs
View File

@@ -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; } public bool SendToSyslogServers { get; set; }

9
Testers/EonaCat.Logger.Test.Web/Logger.cs
View File

@@ -8,7 +8,7 @@ namespace EonaCat.Logger.Test.Web;
public static class Logger public static class Logger
{ {
private static LogManager LogManager; private static LogManager LogManager;
public static ELogType MinLogType { get; set; } public static ELogType MaxLogType { get; set; }
public static bool UseLocalTime { get; set; } public static bool UseLocalTime { get; set; }
public static string LogFolder => Path.Combine(FileLoggerOptions.DefaultPath, "logs"); public static string LogFolder => Path.Combine(FileLoggerOptions.DefaultPath, "logs");
public static string CurrentLogFile => LogManager.CurrentLogFile; public static string CurrentLogFile => LogManager.CurrentLogFile;
@@ -98,7 +98,10 @@ public static class Logger
if (IsDisabled) if (IsDisabled)
return; return;
LogManager.Write(exception, message, writeToConsole: writeToConsole); if (ELogType.ERROR <= MaxLogType)
{
LogManager.Write(exception, message, writeToConsole: writeToConsole);
}
} }
public static void Configure() public static void Configure()
@@ -106,7 +109,7 @@ public static class Logger
var loggerSettings = new LoggerSettings var loggerSettings = new LoggerSettings
{ {
Id = "EonaCatTestLogger", Id = "EonaCatTestLogger",
MinLogType = ELogType.INFO, MaxLogType = ELogType.INFO,
UseLocalTime = UseLocalTime, UseLocalTime = UseLocalTime,
FileLoggerOptions = FileLoggerOptions =
{ {

6
Testers/EonaCat.Logger.Test.Web/Program.cs
View File

@@ -62,7 +62,7 @@ builder.Services.AddMemoryCache();
var app = builder.Build(); var app = builder.Build();
Logger.UseLocalTime = true; Logger.UseLocalTime = true;
Logger.MinLogType = ELogType.TRACE; Logger.MaxLogType = ELogType.TRACE;
Logger.Configure(); Logger.Configure();
// Configure the HTTP request pipeline. // Configure the HTTP request pipeline.
@@ -105,7 +105,7 @@ void RunLoggingExceptionTests()
var loggerSettings = new LoggerSettings(); var loggerSettings = new LoggerSettings();
loggerSettings.FileLoggerOptions.UseLocalTime = true; loggerSettings.FileLoggerOptions.UseLocalTime = true;
loggerSettings.UseLocalTime = true; loggerSettings.UseLocalTime = true;
loggerSettings.MinLogType = ELogType.INFO; loggerSettings.MaxLogType = ELogType.INFO;
var logger = new LogManager(loggerSettings); var logger = new LogManager(loggerSettings);
for (var i = 0; i < 10; i++) for (var i = 0; i < 10; i++)
@@ -171,7 +171,7 @@ void RunLoggingTests()
var loggerSettings = new LoggerSettings(); var loggerSettings = new LoggerSettings();
loggerSettings.UseLocalTime = true; loggerSettings.UseLocalTime = true;
loggerSettings.FileLoggerOptions.UseLocalTime = true; loggerSettings.FileLoggerOptions.UseLocalTime = true;
loggerSettings.MinLogType = ELogType.INFO; loggerSettings.MaxLogType = ELogType.INFO;
loggerSettings.FileLoggerOptions.FileSizeLimit = 1024 * 1024 * 1; loggerSettings.FileLoggerOptions.FileSizeLimit = 1024 * 1024 * 1;
loggerSettings.FileLoggerOptions.FileNamePrefix = "AllTypes"; loggerSettings.FileLoggerOptions.FileNamePrefix = "AllTypes";
loggerSettings.FileLoggerOptions.MaxRolloverFiles = 5; loggerSettings.FileLoggerOptions.MaxRolloverFiles = 5;