From 2085e5a8ca1aa7aaffb20187cfb2392547429c90 Mon Sep 17 00:00:00 2001 From: jvyden Date: Thu, 21 Oct 2021 01:45:31 -0400 Subject: [PATCH] Cleanup code --- .../Logging/AspNetToKettuLogger.cs | 2 +- .../Logging/AspNetToKettuLoggerProvider.cs | 2 +- ProjectLighthouse/Logging/LoggerLevels.cs | 20 +++++++++---------- ProjectLighthouse/Logging/NullScope.cs | 4 +++- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ProjectLighthouse/Logging/AspNetToKettuLogger.cs b/ProjectLighthouse/Logging/AspNetToKettuLogger.cs index 25bee116..8dd7d38e 100644 --- a/ProjectLighthouse/Logging/AspNetToKettuLogger.cs +++ b/ProjectLighthouse/Logging/AspNetToKettuLogger.cs @@ -20,7 +20,7 @@ namespace LBPUnion.ProjectLighthouse.Logging { LogLevel.Error => LoggerLevelAspNetError.Instance, LogLevel.Critical => LoggerLevelAspNetCritical.Instance, LogLevel.None => LoggerLevelAspNetNone.Instance, - _ => throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null) + _ => throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null), }; Logger.Log(state.ToString(), loggerLevel); diff --git a/ProjectLighthouse/Logging/AspNetToKettuLoggerProvider.cs b/ProjectLighthouse/Logging/AspNetToKettuLoggerProvider.cs index 0766cde9..557b4462 100644 --- a/ProjectLighthouse/Logging/AspNetToKettuLoggerProvider.cs +++ b/ProjectLighthouse/Logging/AspNetToKettuLoggerProvider.cs @@ -5,7 +5,7 @@ namespace LBPUnion.ProjectLighthouse.Logging { [ProviderAlias("Kettu")] public class AspNetToKettuLoggerProvider : ILoggerProvider, IDisposable { public void Dispose() { - // cry about it + GC.SuppressFinalize(this); } public ILogger CreateLogger(string categoryName) { diff --git a/ProjectLighthouse/Logging/LoggerLevels.cs b/ProjectLighthouse/Logging/LoggerLevels.cs index 133fa89f..4f8de4e3 100644 --- a/ProjectLighthouse/Logging/LoggerLevels.cs +++ b/ProjectLighthouse/Logging/LoggerLevels.cs @@ -3,53 +3,53 @@ using Kettu; namespace LBPUnion.ProjectLighthouse.Logging { public class LoggerLevelStartup : LoggerLevel { public override string Name => "Startup"; - public static LoggerLevelStartup Instance = new(); + public static readonly LoggerLevelStartup Instance = new(); } public class LoggerLevelDatabase : LoggerLevel { public override string Name => "Database"; - public static LoggerLevelDatabase Instance = new(); + public static readonly LoggerLevelDatabase Instance = new(); } public class LoggerLevelHttp : LoggerLevel { public override string Name => "HTTP"; - public static LoggerLevelHttp Instance = new(); + public static readonly LoggerLevelHttp Instance = new(); } #region ASP.NET public class LoggerLevelAspNetTrace : LoggerLevel { public override string Name => "ASP.NET: Trace"; - public static LoggerLevelAspNetTrace Instance = new(); + public static readonly LoggerLevelAspNetTrace Instance = new(); } public class LoggerLevelAspNetDebug : LoggerLevel { public override string Name => "ASP.NET: Debug"; - public static LoggerLevelAspNetDebug Instance = new(); + public static readonly LoggerLevelAspNetDebug Instance = new(); } public class LoggerLevelAspNetInformation : LoggerLevel { public override string Name => "ASP.NET: Information"; - public static LoggerLevelAspNetInformation Instance = new(); + public static readonly LoggerLevelAspNetInformation Instance = new(); } public class LoggerLevelAspNetWarning : LoggerLevel { public override string Name => "ASP.NET: Warning"; - public static LoggerLevelAspNetWarning Instance = new(); + public static readonly LoggerLevelAspNetWarning Instance = new(); } public class LoggerLevelAspNetError : LoggerLevel { public override string Name => "ASP.NET: Error"; - public static LoggerLevelAspNetError Instance = new(); + public static readonly LoggerLevelAspNetError Instance = new(); } public class LoggerLevelAspNetCritical : LoggerLevel { public override string Name => "ASP.NET: Critical"; - public static LoggerLevelAspNetCritical Instance = new(); + public static readonly LoggerLevelAspNetCritical Instance = new(); } public class LoggerLevelAspNetNone : LoggerLevel { public override string Name => "ASP.NET: None"; - public static LoggerLevelAspNetNone Instance = new(); + public static readonly LoggerLevelAspNetNone Instance = new(); } #endregion } \ No newline at end of file diff --git a/ProjectLighthouse/Logging/NullScope.cs b/ProjectLighthouse/Logging/NullScope.cs index 2df62c0f..3152fea5 100644 --- a/ProjectLighthouse/Logging/NullScope.cs +++ b/ProjectLighthouse/Logging/NullScope.cs @@ -6,6 +6,8 @@ namespace LBPUnion.ProjectLighthouse.Logging { private NullScope() {} - public void Dispose() {} + public void Dispose() { + GC.SuppressFinalize(this); + } } } \ No newline at end of file