From c19d512631d13cecd25a96c8bcec166925753cf1 Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Sat, 25 Mar 2023 12:07:28 -0400 Subject: [PATCH] Update Logger.cs code formatting and using adjustment --- mRemoteNG/App/Logger.cs | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/mRemoteNG/App/Logger.cs b/mRemoteNG/App/Logger.cs index 7501cdd4..5667b04c 100644 --- a/mRemoteNG/App/Logger.cs +++ b/mRemoteNG/App/Logger.cs @@ -1,14 +1,11 @@ using System; using System.IO; -using System.Reflection; using System.Runtime.Versioning; using System.Windows.Forms; using log4net; using log4net.Appender; using log4net.Config; -using mRemoteNG.Properties; - -// ReSharper disable ArrangeAccessorOwnerBody +using log4net.Repository; namespace mRemoteNG.App { @@ -29,22 +26,27 @@ namespace mRemoteNG.App private void Initialize() { XmlConfigurator.Configure(LogManager.CreateRepository("mRemoteNG")); + if (string.IsNullOrEmpty(Properties.OptionsNotificationsPage.Default.LogFilePath)) + { Properties.OptionsNotificationsPage.Default.LogFilePath = BuildLogFilePath(); + } SetLogPath(Properties.OptionsNotificationsPage.Default.LogToApplicationDirectory ? DefaultLogPath : Properties.OptionsNotificationsPage.Default.LogFilePath); } public void SetLogPath(string path) { - var repository = LogManager.GetRepository("mRemoteNG"); + ILoggerRepository repository = LogManager.GetRepository("mRemoteNG"); + XmlConfigurator.Configure(repository, new FileInfo("log4net.config")); - var appenders = repository.GetAppenders(); + + IAppender[] appenders = repository.GetAppenders(); foreach (var appender in appenders) { - var fileAppender = (RollingFileAppender)appender; - if (fileAppender == null || fileAppender.Name != "LogFileAppender") continue; + RollingFileAppender fileAppender = (RollingFileAppender)appender; + if (fileAppender is not { Name: "LogFileAppender" }) continue; fileAppender.File = path; fileAppender.ActivateOptions(); } @@ -54,22 +56,26 @@ namespace mRemoteNG.App private static string BuildLogFilePath() { - var logFilePath = Runtime.IsPortableEdition ? GetLogPathPortableEdition() : GetLogPathNormalEdition(); - var logFileName = Path.ChangeExtension(Application.ProductName, ".log"); + string logFilePath = Runtime.IsPortableEdition ? GetLogPathPortableEdition() : GetLogPathNormalEdition(); + + string logFileName = Path.ChangeExtension(Application.ProductName, ".log"); + if (logFileName == null) return "mRemoteNG.log"; - var logFile = Path.Combine(logFilePath, logFileName); + + string logFile = Path.Combine(logFilePath, logFileName); + return logFile; } private static string GetLogPathNormalEdition() { - return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), - Application.ProductName); + return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName); } private static string GetLogPathPortableEdition() { return Application.StartupPath; } + } } \ No newline at end of file