diff --git a/ProjectLighthouse/Logging/AspNetToKettuLogger.cs b/ProjectLighthouse/Logging/AspNetToKettuLogger.cs index 944fafa5..f1af4bb7 100644 --- a/ProjectLighthouse/Logging/AspNetToKettuLogger.cs +++ b/ProjectLighthouse/Logging/AspNetToKettuLogger.cs @@ -12,17 +12,7 @@ namespace LBPUnion.ProjectLighthouse.Logging { public bool IsEnabled(LogLevel logLevel) => true; public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) { - LoggerLevel loggerLevel = logLevel switch { - - LogLevel.Trace => LoggerLevelAspNetTrace.Instance, - LogLevel.Debug => LoggerLevelAspNetDebug.Instance, - LogLevel.Information => LoggerLevelAspNetInformation.Instance, - LogLevel.Warning => LoggerLevelAspNetWarning.Instance, - LogLevel.Error => LoggerLevelAspNetError.Instance, - LogLevel.Critical => LoggerLevelAspNetCritical.Instance, - LogLevel.None => LoggerLevelAspNetNone.Instance, - _ => throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null), - }; + LoggerLevel loggerLevel = new LoggerLevelAspNet(logLevel); Logger.Log(state.ToString(), loggerLevel); if(exception == null) return; diff --git a/ProjectLighthouse/Logging/LighthouseFileLogger.cs b/ProjectLighthouse/Logging/LighthouseFileLogger.cs index 98cb4d60..88f7a4f2 100644 --- a/ProjectLighthouse/Logging/LighthouseFileLogger.cs +++ b/ProjectLighthouse/Logging/LighthouseFileLogger.cs @@ -9,9 +9,14 @@ namespace LBPUnion.ProjectLighthouse.Logging { public override void Send(LoggerLine line) { FileHelper.EnsureDirectoryCreated(logsDirectory); - - File.AppendAllText(Path.Combine(logsDirectory, line.LoggerLevel + ".log"), line.LineData + "\n"); - File.AppendAllText(Path.Combine(logsDirectory, "all.log"), line.LineData + "\n"); + + string channel = string.IsNullOrEmpty(line.LoggerLevel.Channel) ? "" : $"[{line.LoggerLevel.Channel}] "; + + string contentFile = $"{channel}{line.LineData}\n"; + string contentAll = $"[{$"{line.LoggerLevel.Name} {channel}".TrimEnd()}] {line.LineData}\n"; + + File.AppendAllText(Path.Combine(logsDirectory, line.LoggerLevel.Name + ".log"), contentFile); + File.AppendAllText(Path.Combine(logsDirectory, "all.log"), contentAll); } } } \ No newline at end of file diff --git a/ProjectLighthouse/Logging/LoggerLevels.cs b/ProjectLighthouse/Logging/LoggerLevels.cs index 4f8de4e3..72831dd3 100644 --- a/ProjectLighthouse/Logging/LoggerLevels.cs +++ b/ProjectLighthouse/Logging/LoggerLevels.cs @@ -1,4 +1,5 @@ using Kettu; +using Microsoft.Extensions.Logging; namespace LBPUnion.ProjectLighthouse.Logging { public class LoggerLevelStartup : LoggerLevel { @@ -16,40 +17,11 @@ namespace LBPUnion.ProjectLighthouse.Logging { public static readonly LoggerLevelHttp Instance = new(); } - #region ASP.NET - public class LoggerLevelAspNetTrace : LoggerLevel { - public override string Name => "ASP.NET: Trace"; - public static readonly LoggerLevelAspNetTrace Instance = new(); + public class LoggerLevelAspNet : LoggerLevel { + public override string Name => "AspNet"; + + public LoggerLevelAspNet(LogLevel level) { + this.Channel = level.ToString(); + } } - - public class LoggerLevelAspNetDebug : LoggerLevel { - public override string Name => "ASP.NET: Debug"; - public static readonly LoggerLevelAspNetDebug Instance = new(); - } - - public class LoggerLevelAspNetInformation : LoggerLevel { - public override string Name => "ASP.NET: Information"; - public static readonly LoggerLevelAspNetInformation Instance = new(); - } - - public class LoggerLevelAspNetWarning : LoggerLevel { - public override string Name => "ASP.NET: Warning"; - public static readonly LoggerLevelAspNetWarning Instance = new(); - } - - public class LoggerLevelAspNetError : LoggerLevel { - public override string Name => "ASP.NET: Error"; - public static readonly LoggerLevelAspNetError Instance = new(); - } - - public class LoggerLevelAspNetCritical : LoggerLevel { - public override string Name => "ASP.NET: Critical"; - public static readonly LoggerLevelAspNetCritical Instance = new(); - } - - public class LoggerLevelAspNetNone : LoggerLevel { - public override string Name => "ASP.NET: None"; - public static readonly LoggerLevelAspNetNone Instance = new(); - } - #endregion } \ No newline at end of file diff --git a/ProjectLighthouse/ProjectLighthouse.csproj b/ProjectLighthouse/ProjectLighthouse.csproj index b7a138f8..35309169 100644 --- a/ProjectLighthouse/ProjectLighthouse.csproj +++ b/ProjectLighthouse/ProjectLighthouse.csproj @@ -9,7 +9,7 @@ - + @@ -23,4 +23,8 @@ + + + +