1 files changed, 23 insertions, 32 deletions

diff --git a/src/Agent.App/Logging/RollingFileLog.cs b/src/Agent.App/Logging/RollingFileLog.cs
index 801768d..8bdbbb4 100644
--- a/src/Agent.App/Logging/RollingFileLog.cs
+++ b/src/Agent.App/Logging/RollingFileLog.cs
@@ -4,52 +4,43 @@ namespace Agent.App.Logging;
 
 public sealed class RollingFileLog : IDisposable
 {
-    private readonly object _sync = new();
-    private readonly string _path;
-    private readonly long _maxBytes;
-    private readonly int _retainedFiles;
-    private StreamWriter _writer;
+    private readonly RollingFileWriter _writer;
+    private readonly int _minimumLevel;
 
-    public RollingFileLog(string directory, long maxBytes, int retainedFiles)
+    public RollingFileLog(string directory, long maxBytes, int retainedFiles, string minimumLevel = "information")
     {
         Directory.CreateDirectory(directory);
-        _path = Path.Combine(directory, "application.log");
-        _maxBytes = maxBytes;
-        _retainedFiles = retainedFiles;
-        _writer = Open();
+        _writer = new RollingFileWriter(Path.Combine(directory, "application.log"), maxBytes, retainedFiles);
+        _minimumLevel = ParseLevel(minimumLevel);
     }
 
     public void Information(string message) => Write("INF", message);
+    public void Operational(string message) => Write("INF", message, force: true);
+    public void Warning(string message) => Write("WRN", message);
     public void Error(string message) => Write("ERR", message);
+    public void Fatal(string message) => Write("FTL", message);
 
-    private void Write(string level, string message)
+    private void Write(string level, string message, bool force = false)
     {
-        lock (_sync)
-        {
-            if (_writer.BaseStream.Length >= _maxBytes) Rotate();
-            string line = string.Create(CultureInfo.InvariantCulture, $"{DateTimeOffset.UtcNow:O} [{level}] {message}");
-            Console.Error.WriteLine(line);
-            _writer.WriteLine(line);
-            _writer.Flush();
-        }
+        if (!force && Level(level) < _minimumLevel) return;
+        string line = string.Create(CultureInfo.InvariantCulture, $"{DateTimeOffset.UtcNow:O} [{level}] {message}");
+        Console.Error.WriteLine(line);
+        _writer.WriteLine(line);
     }
 
-    private StreamWriter Open() => new(new FileStream(_path, FileMode.Append, FileAccess.Write, FileShare.Read), new System.Text.UTF8Encoding(false));
-
-    private void Rotate()
+    private static int ParseLevel(string level) => level.ToLowerInvariant() switch
     {
-        _writer.Dispose();
-        for (int index = _retainedFiles - 1; index >= 1; index--)
-        {
-            string source = $"{_path}.{index}";
-            if (File.Exists(source)) File.Move(source, $"{_path}.{index + 1}", true);
-        }
-        if (File.Exists(_path)) File.Move(_path, $"{_path}.1", true);
-        _writer = Open();
-    }
+        "information" or "info" => 0,
+        "warning" or "warn" => 1,
+        "error" => 2,
+        "fatal" => 3,
+        _ => throw new ArgumentException($"Unknown logging level '{level}'.", nameof(level))
+    };
+
+    private static int Level(string level) => level switch { "INF" => 0, "WRN" => 1, "ERR" => 2, "FTL" => 3, _ => 0 };
 
     public void Dispose()
     {
-        lock (_sync) _writer.Dispose();
+        _writer.Dispose();
     }
 }