From a97432e9c7fd67258995f9800c16e3687f3bed25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= Date: Wed, 2 Aug 2023 08:38:18 +0200 Subject: [PATCH] Debug/Release loglevel, title --- src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs | 12 ++++++++---- src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs | 8 +++++--- .../ViewModels/MainWindowViewModel.cs | 3 +++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs index 4aa6f13..fdc8458 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Program.cs @@ -64,13 +64,15 @@ public static class Program if (!Directory.Exists(logFolder)) Directory.CreateDirectory(logFolder); Log.Logger = new LoggerConfiguration() +#if DEBUG || VERBOSE_LOGGING .MinimumLevel.Verbose() +#endif .Enrich.FromLogContext() .WriteTo.File( Path.Combine(logFolder, "appLog.log"), fileSizeLimitBytes: 10 * 1024 * 1024, - rollOnFileSizeLimit: true, - rollingInterval: RollingInterval.Day) + rollingInterval: RollingInterval.Day, + rollOnFileSizeLimit: true) .CreateBootstrapLogger(); } @@ -82,9 +84,11 @@ public static class Program { #if DEBUG InitDevelopment(); -#else - InitRelease(); #endif + if (AppDataRoot is null) + { + InitRelease(); + } InitLogging(); Log.Logger.Information("Early app starting..."); diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs index de0bbd2..4b9e3ee 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs @@ -87,18 +87,20 @@ public static class Startup (serviceProvider, loggerConfiguration) => { loggerConfiguration +#if DEBUG || VERBOSE_LOGGING .MinimumLevel.Verbose() +#endif .ReadFrom.Configuration(serviceProvider.GetRequiredService()) .Enrich.FromLogContext() .WriteTo.File( Path.Combine(Program.AppDataRoot, "logs", "appLog.log"), fileSizeLimitBytes: 10 * 1024 * 1024, - rollOnFileSizeLimit: true, - rollingInterval: RollingInterval.Day) + rollingInterval: RollingInterval.Day, + rollOnFileSizeLimit: true) .WriteTo.Sink(serviceProvider.GetRequiredService()); } ); - + serviceCollection.AddLogging(loggingBuilder => loggingBuilder.AddSerilog(dispose: true) ); diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/ViewModels/MainWindowViewModel.cs b/src/GuiApp/Avalonia/FileTime.GuiApp/ViewModels/MainWindowViewModel.cs index 7de1d6b..22285cf 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp/ViewModels/MainWindowViewModel.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp/ViewModels/MainWindowViewModel.cs @@ -55,6 +55,9 @@ public partial class MainWindowViewModel : IMainWindowViewModel } Title = "FileTime " + versionString; +#if DEBUG + Title += " (Debug)"; +#endif Task.Run(async () => await _lifecycleService.InitStartupHandlersAsync()).Wait(); }