Skip to content

Allow log level selection #2739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 12, 2025
Merged

Allow log level selection #2739

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e870dd2
Allow log level selection
VictoriousRaptor May 29, 2024
44a90e5
Write log level in log
VictoriousRaptor Mar 11, 2025
8d3fd75
Add getter and setter
VictoriousRaptor Mar 12, 2025
3fe52f9
Merge branch 'dev' into debug-log-level
Jack251970 Mar 12, 2025
11acca6
Move log level to enum & Use info level as default
Jack251970 Mar 12, 2025
05ff797
Use one function to set log level
Jack251970 Mar 12, 2025
66bf046
Add log level change to general settings page
Jack251970 Mar 12, 2025
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
24 changes: 20 additions & 4 deletions Flow.Launcher.Infrastructure/Logger/Log.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,33 @@ static Log()
configuration.AddTarget("file", fileTargetASyncWrapper);
configuration.AddTarget("debug", debugTarget);

var fileRule = new LoggingRule("*", LogLevel.Debug, fileTargetASyncWrapper)
{
RuleName = "file"
};
#if DEBUG
var fileRule = new LoggingRule("*", LogLevel.Debug, fileTargetASyncWrapper);
var debugRule = new LoggingRule("*", LogLevel.Debug, debugTarget);
var debugRule = new LoggingRule("*", LogLevel.Debug, debugTarget)
{
RuleName = "debug"
};
configuration.LoggingRules.Add(debugRule);
#else
var fileRule = new LoggingRule("*", LogLevel.Info, fileTargetASyncWrapper);
#endif
configuration.LoggingRules.Add(fileRule);
LogManager.Configuration = configuration;
}

public static void UseDebugLogLevel()
{
LogManager.Configuration.FindRuleByName("file").SetLoggingLevels(LogLevel.Debug, LogLevel.Fatal);
Info(nameof(Logger), "Using DEBUG log level.");
}

public static void UseInfoLogLevel()
{
LogManager.Configuration.FindRuleByName("file").SetLoggingLevels(LogLevel.Info, LogLevel.Fatal);
Info(nameof(Logger), "Using INFO log level.");
}

private static void LogFaultyFormat(string message)
{
var logger = LogManager.GetLogger("FaultyLogger");
Expand Down
2 changes: 2 additions & 0 deletions Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ public CustomBrowserViewModel CustomBrowser
}
};

public string LogLevel = "info";

/// <summary>
/// when false Alphabet static service will always return empty results
/// </summary>
Expand Down
14 changes: 14 additions & 0 deletions Flow.Launcher/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,20 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>

var imageLoadertask = ImageLoader.InitializeAsync();

switch (_settings.LogLevel)
{
case "debug":
Log.UseDebugLogLevel();
break;
case "info":
Log.UseInfoLogLevel();
break;
default:
Log.Error(nameof(Flow.Launcher.App), "Unrecognized log level");
Log.UseDebugLogLevel();
break;
}

AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);

// TODO: Clean InternationalizationManager.Instance and InternationalizationManager.Instance.GetTranslation in future
Expand Down
Loading