From b4aa1d6ed644060edf96fd1001c1f64e84023de0 Mon Sep 17 00:00:00 2001 From: Simon G Date: Mon, 26 Apr 2021 14:03:16 +0200 Subject: [PATCH] - LoggerInitializer doesn't need to be disposed, log is disposing loggers --- .../Loggers/Interfaces/ILoggerInitializer.cs | 4 +--- Lib.Logging/Loggers/LoggerInitializer.cs | 20 ++++--------------- Mystify/App.axaml.cs | 10 ++-------- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Lib.Logging/Loggers/Interfaces/ILoggerInitializer.cs b/Lib.Logging/Loggers/Interfaces/ILoggerInitializer.cs index d7229e6..c325429 100644 --- a/Lib.Logging/Loggers/Interfaces/ILoggerInitializer.cs +++ b/Lib.Logging/Loggers/Interfaces/ILoggerInitializer.cs @@ -2,11 +2,9 @@ // Created: 2020-09-14 // Copyright(c) 2020 SimonG. All Rights Reserved. -using System; - namespace Lib.Logging.Loggers.Interfaces { - public interface ILoggerInitializer : IAsyncDisposable + public interface ILoggerInitializer { bool Init(); } diff --git a/Lib.Logging/Loggers/LoggerInitializer.cs b/Lib.Logging/Loggers/LoggerInitializer.cs index 152bf4a..27cbbd8 100644 --- a/Lib.Logging/Loggers/LoggerInitializer.cs +++ b/Lib.Logging/Loggers/LoggerInitializer.cs @@ -20,9 +20,6 @@ namespace Lib.Logging.Loggers private readonly IFileLoggerFactory _fileLoggerFactory; private readonly IConsoleLoggerFactory _consoleLoggerFactory; - private IFileLogger? _fileLogger; - private IConsoleLogger? _consoleLogger; - public LoggerInitializer(ILog log, IFileLoggerFactory fileLoggerFactory, IConsoleLoggerFactory consoleLoggerFactory) { _log = log; @@ -32,22 +29,13 @@ namespace Lib.Logging.Loggers public bool Init() { - _fileLogger = _fileLoggerFactory.Create(_logFilePath, _logFileName); - _log.AddLogger(_fileLogger); + IFileLogger fileLogger = _fileLoggerFactory.Create(_logFilePath, _logFileName); + _log.AddLogger(fileLogger); - _consoleLogger = _consoleLoggerFactory.Create(); - _log.AddLogger(_consoleLogger); + IConsoleLogger consoleLogger = _consoleLoggerFactory.Create(); + _log.AddLogger(consoleLogger); return true; } - - public async ValueTask DisposeAsync() - { - if (_fileLogger != null) - await _fileLogger.DisposeAsync(); - - if (_consoleLogger != null) - await _consoleLogger.DisposeAsync(); - } } } \ No newline at end of file diff --git a/Mystify/App.axaml.cs b/Mystify/App.axaml.cs index 85ac5dc..05450d4 100644 --- a/Mystify/App.axaml.cs +++ b/Mystify/App.axaml.cs @@ -25,10 +25,7 @@ namespace Mystify private IIocContainer? _kernel; private ILog? _log; - private ILoggerInitializer? _loggerInitializer; - private IProcessManager? _processManager; - private INotifyIcon? _notifyIcon; private MainModel? _mainModel; @@ -48,8 +45,8 @@ namespace Mystify _log = logFactory.Create(); ILoggerInitializerFactory loggerInitializerFactory = _kernel.Resolve(); - _loggerInitializer = loggerInitializerFactory.Create(_log); - _loggerInitializer.Init(); + ILoggerInitializer loggerInitializer = loggerInitializerFactory.Create(_log); + loggerInitializer.Init(); await _log.WriteLogHeader(); @@ -103,9 +100,6 @@ namespace Mystify if (_log != null) await _log.DisposeAsync(); - if (_loggerInitializer != null) - await _loggerInitializer.DisposeAsync(); - _kernel?.Dispose(); } }