From fe52d2c3b58ec3cfb6485fe44fd60e389e4ac680 Mon Sep 17 00:00:00 2001 From: glax Date: Sun, 21 May 2023 02:10:32 +0200 Subject: [PATCH] Always create and use MemoryLogger --- Logging/Logger.cs | 14 +++++++++----- Tranga-CLI/Tranga_Cli.cs | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Logging/Logger.cs b/Logging/Logger.cs index 365c690..2ec5fce 100644 --- a/Logging/Logger.cs +++ b/Logging/Logger.cs @@ -9,13 +9,12 @@ public class Logger : TextWriter public enum LoggerType { FileLogger, - ConsoleLogger, - MemoryLogger + ConsoleLogger } private FileLogger? _fileLogger; private FormattedConsoleLogger? _formattedConsoleLogger; - private MemoryLogger? _memoryLogger; + private MemoryLogger _memoryLogger; private TextWriter? stdOut; public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encoding, string? logFilePath) @@ -30,7 +29,7 @@ public class Logger : TextWriter throw new ArgumentException($"logFilePath can not be null for LoggerType {LoggerType.FileLogger}"); } _formattedConsoleLogger = enabledLoggers.Contains(LoggerType.ConsoleLogger) ? new FormattedConsoleLogger(null, encoding) : null; - _memoryLogger = enabledLoggers.Contains(LoggerType.MemoryLogger) ? new MemoryLogger(null, encoding) : null; + _memoryLogger = new MemoryLogger(null, encoding); } public void WriteLine(string caller, string? value) @@ -46,9 +45,14 @@ public class Logger : TextWriter return; _fileLogger?.Write(caller, value); - _memoryLogger?.Write(caller, value); _formattedConsoleLogger?.Write(caller, value); + _memoryLogger.Write(caller, value); stdOut?.Write(value); } + + public string[] Tail(uint? lines) + { + return _memoryLogger.Tail(lines); + } } \ No newline at end of file diff --git a/Tranga-CLI/Tranga_Cli.cs b/Tranga-CLI/Tranga_Cli.cs index cddbca6..042a562 100644 --- a/Tranga-CLI/Tranga_Cli.cs +++ b/Tranga-CLI/Tranga_Cli.cs @@ -14,7 +14,7 @@ public static class Tranga_Cli { public static void Main(string[] args) { - Logger logger = new(new[] { Logger.LoggerType.FileLogger, Logger.LoggerType.MemoryLogger }, null, null, + Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, Path.Join(Directory.GetCurrentDirectory(), $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt")); logger.WriteLine("Tranga_CLI", "Loading Settings.");