Skip to content

Commit 26cf8a3

Browse files
authored
Code quality: Simplify the initialization of Log and remove unnecessary Nuget packages (#1206)
* Code quality: Simplify the part of initializing Log in Program * Code quality: Remove NLog.Schema because NLog.config is not used
1 parent a2e71cb commit 26cf8a3

5 files changed

Lines changed: 47 additions & 5362 deletions

File tree

AutoDarkModeSvc/AutoDarkModeSvc.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
6464
<PackageReference Include="Microsoft.VisualStudio.VsixColorCompiler" Version="17.11.35325.10" />
6565
<PackageReference Include="NLog" Version="6.0.4" />
66-
<PackageReference Include="NLog.Schema" Version="6.0.4" />
6766
<PackageReference Include="System.Drawing.Common" Version="9.0.9" />
6867
<PackageReference Include="System.Management" Version="9.0.12" />
6968
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />

AutoDarkModeSvc/Core/LoggerSetup.cs

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
#endregion
1717
using System;
18+
using System.Collections.Generic;
1819
using System.IO;
1920
using AutoDarkModeLib;
2021
using NLog;
@@ -44,29 +45,57 @@ public static class LoggerSetup
4445
"cleanNamesOfAsyncContinuations=true}: ${message} ${exception}"
4546
};
4647

47-
public static void UpdateLogmanConfig()
48+
/// <summary>
49+
/// Initialize logging based on command line arguments
50+
/// </summary>
51+
public static void InitializeLogging(List<string> args)
52+
{
53+
//Set up Logger
54+
NLog.Config.LoggingConfiguration config = new();
55+
56+
// Rules for mapping loggers to targets
57+
config.AddRule(LogLevel.Trace, LogLevel.Fatal, LoggerSetup.Logconsole);
58+
if (args.Contains("/debug"))
59+
{
60+
config.AddRule(LogLevel.Debug, LogLevel.Fatal, LoggerSetup.Logfile);
61+
}
62+
else if (args.Contains("/trace"))
63+
{
64+
config.AddRule(LogLevel.Trace, LogLevel.Fatal, LoggerSetup.Logfile);
65+
}
66+
else
67+
{
68+
config.AddRule(LogLevel.Info, LogLevel.Fatal, LoggerSetup.Logfile);
69+
}
70+
// Apply config
71+
LogManager.Configuration = config;
72+
}
73+
74+
/// <summary>
75+
/// Update logging configuration based on config file settings
76+
/// </summary>
77+
public static void UpdateLoggingFromConfig()
4878
{
4979
AdmConfigBuilder builder = AdmConfigBuilder.Instance();
5080
var config = new NLog.Config.LoggingConfiguration();
5181
config.AddRule(LogLevel.Trace, LogLevel.Fatal, Logconsole);
52-
if (builder.Config.Tunable.Debug)
82+
83+
if (builder.Config.Tunable.Trace)
84+
{
85+
Logger.Info("enabling trace logs");
86+
config.AddRule(LogLevel.Trace, LogLevel.Fatal, Logfile);
87+
}
88+
else if (builder.Config.Tunable.Debug)
5389
{
54-
if (builder.Config.Tunable.Trace)
55-
{
56-
Logger.Info("enabling trace logs");
57-
config.AddRule(LogLevel.Trace, LogLevel.Fatal, Logfile);
58-
}
59-
else
60-
{
61-
Logger.Info("enabling debug logs");
62-
config.AddRule(LogLevel.Debug, LogLevel.Fatal, Logfile);
63-
}
90+
Logger.Info("enabling debug logs");
91+
config.AddRule(LogLevel.Debug, LogLevel.Fatal, Logfile);
6492
}
6593
else
6694
{
6795
Logger.Info("enabling standard logging");
6896
config.AddRule(LogLevel.Info, LogLevel.Fatal, Logfile);
6997
}
98+
7099
LogManager.Configuration = config;
71100
}
72101
}

AutoDarkModeSvc/Monitors/ConfigUpdateEvents/LoggingVerbosityEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ protected override void ChangeEvent()
2525
{
2626
bool debugToggled = newConfig.Tunable.Debug != oldConfig.Tunable.Debug;
2727
bool traceToggled = newConfig.Tunable.Trace != oldConfig.Tunable.Trace;
28-
if (debugToggled || traceToggled) LoggerSetup.UpdateLogmanConfig();
28+
if (debugToggled || traceToggled) LoggerSetup.UpdateLoggingFromConfig();
2929
}
3030
}

0 commit comments

Comments
 (0)