Improve some basics

Sella-GH · Jun 4, 2024 · a9ddc19 · a9ddc19
1 parent a9562f1
commit a9ddc19
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/AzzyBot-Next/Logging/FileLogger.cs b/AzzyBot-Next/Logging/FileLogger.cs
@@ -5,15 +5,12 @@
 
 namespace AzzyBot.Logging;
 
-public sealed class FileLogger(string filePath) : ILogger, IDisposable
+public sealed class FileLogger(string path) : ILogger, IDisposable
 {
-    private readonly string _filePath = filePath;
+    private readonly string _path = path;
     private readonly SemaphoreSlim _semaphore = new(1, 1);
 
-#pragma warning disable CS8633 // Nullability in constraints for type parameter doesn't match the constraints for type parameter in implicitly implemented interface method'.
-    public IDisposable? BeginScope<TState>(TState? state) => null;
-#pragma warning restore CS8633 // Nullability in constraints for type parameter doesn't match the constraints for type parameter in implicitly implemented interface method'.
-
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull => default!;
     public bool IsEnabled(LogLevel logLevel) => true;
     public void Dispose() => Dispose(true);
 
@@ -27,6 +24,9 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
     {
         ArgumentNullException.ThrowIfNull(formatter, nameof(formatter));
 
+        if (!IsEnabled(logLevel))
+            return;
+
         _semaphore.Wait();
 
         string message = formatter(state, exception);
@@ -40,7 +40,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 
         try
         {
-            File.AppendAllText(_filePath, logMessage);
+            File.AppendAllText(_path, logMessage);
         }
         finally
         {

diff --git a/AzzyBot-Next/Logging/FileLoggerProvider.cs b/AzzyBot-Next/Logging/FileLoggerProvider.cs
@@ -9,10 +9,7 @@ public sealed class FileLoggerProvider(string filePath) : ILoggerProvider
     private readonly string _filePath = filePath;
     private readonly ConcurrentDictionary<string, FileLogger> _loggers = new();
 
-    public ILogger CreateLogger(string categoryName)
-    {
-        return _loggers.GetOrAdd(categoryName, name => new FileLogger(_filePath));
-    }
+    public ILogger CreateLogger(string categoryName) => _loggers.GetOrAdd(categoryName, name => new FileLogger(_filePath));
 
     public void Dispose()
     {
@@ -23,4 +20,4 @@ public void Dispose()
 
         _loggers.Clear();
     }
-}
+}