Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion AutoDarkModeSvc/AutoDarkModeSvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
<PackageReference Include="Microsoft.VisualStudio.VsixColorCompiler" Version="17.11.35325.10" />
<PackageReference Include="NLog" Version="6.0.4" />
<PackageReference Include="NLog.Schema" Version="6.0.4" />
<PackageReference Include="System.Drawing.Common" Version="9.0.9" />
<PackageReference Include="System.Management" Version="9.0.12" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
Expand Down
53 changes: 41 additions & 12 deletions AutoDarkModeSvc/Core/LoggerSetup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
#endregion
using System;
using System.Collections.Generic;
using System.IO;
using AutoDarkModeLib;
using NLog;
Expand Down Expand Up @@ -44,29 +45,57 @@ public static class LoggerSetup
"cleanNamesOfAsyncContinuations=true}: ${message} ${exception}"
};

public static void UpdateLogmanConfig()
/// <summary>
/// Initialize logging based on command line arguments
/// </summary>
public static void InitializeLogging(List<string> args)
{
//Set up Logger
NLog.Config.LoggingConfiguration config = new();

// Rules for mapping loggers to targets
config.AddRule(LogLevel.Trace, LogLevel.Fatal, LoggerSetup.Logconsole);
if (args.Contains("/debug"))
{
config.AddRule(LogLevel.Debug, LogLevel.Fatal, LoggerSetup.Logfile);
}
else if (args.Contains("/trace"))
{
config.AddRule(LogLevel.Trace, LogLevel.Fatal, LoggerSetup.Logfile);
}
else
{
config.AddRule(LogLevel.Info, LogLevel.Fatal, LoggerSetup.Logfile);
}
// Apply config
LogManager.Configuration = config;
}

/// <summary>
/// Update logging configuration based on config file settings
/// </summary>
public static void UpdateLoggingFromConfig()
{
AdmConfigBuilder builder = AdmConfigBuilder.Instance();
var config = new NLog.Config.LoggingConfiguration();
config.AddRule(LogLevel.Trace, LogLevel.Fatal, Logconsole);
if (builder.Config.Tunable.Debug)

if (builder.Config.Tunable.Trace)
{
Logger.Info("enabling trace logs");
config.AddRule(LogLevel.Trace, LogLevel.Fatal, Logfile);
}
else if (builder.Config.Tunable.Debug)
{
if (builder.Config.Tunable.Trace)
{
Logger.Info("enabling trace logs");
config.AddRule(LogLevel.Trace, LogLevel.Fatal, Logfile);
}
else
{
Logger.Info("enabling debug logs");
config.AddRule(LogLevel.Debug, LogLevel.Fatal, Logfile);
}
Logger.Info("enabling debug logs");
config.AddRule(LogLevel.Debug, LogLevel.Fatal, Logfile);
}
else
{
Logger.Info("enabling standard logging");
config.AddRule(LogLevel.Info, LogLevel.Fatal, Logfile);
}

LogManager.Configuration = config;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ protected override void ChangeEvent()
{
bool debugToggled = newConfig.Tunable.Debug != oldConfig.Tunable.Debug;
bool traceToggled = newConfig.Tunable.Trace != oldConfig.Tunable.Trace;
if (debugToggled || traceToggled) LoggerSetup.UpdateLogmanConfig();
if (debugToggled || traceToggled) LoggerSetup.UpdateLoggingFromConfig();
}
}
Loading