Add logs when the settings app crashes

GH-104

Author: TolikPylypchuk

src/KeyboardSwitch.Core/Services/Settings/JsonSettingsService.cs

@@ -75,7 +75,7 @@ public async Task<AppSettings> GetAppSettings(bool strict = false)
 
     public async Task SaveAppSettings(AppSettings appSettings)
     {
-        logger.LogDebug("Saving the app settings");
+        logger.LogInformation("Saving the app settings");
 
         this.file.Directory?.Create();
         this.file.Truncate();
@@ -88,7 +88,7 @@ public async Task SaveAppSettings(AppSettings appSettings)
 
     public void InvalidateAppSettings()
     {
-        logger.LogDebug("Invalidating the app settings");
+        logger.LogInformation("Invalidating the app settings");
 
         this.appSettings = null;
         this.settingsInvalidated.OnNext(Unit.Default);

src/KeyboardSwitch.Settings.Core/ViewModels/ReactiveForm.cs

@@ -70,14 +70,11 @@ protected void TrackValidationStrict(IObservable<bool> validation) =>
         this.validationsToTrack.Add(validation.StartWith(false));
 
     protected IObservable<bool> IsCollectionChanged<TOtherForm, TOtherModel>(
-        Expression<Func<TForm, ReadOnlyObservableCollection<TOtherForm>>> property,
+        Func<TForm, ReadOnlyObservableCollection<TOtherForm>> property,
         Func<TForm, ICollection<TOtherModel>> itemCollection)
         where TOtherForm : ReactiveForm<TOtherModel, TOtherForm>
-        where TOtherModel : class
-    {
-        string propertyName = property.GetMemberName();
-
-        return property.Compile()(this.Self)
+        where TOtherModel : class =>
+        property(this.Self)
             .ToObservableChangeSet()
             .AutoRefreshOnObservable(vm => vm.FormChanged)
             .ToCollection()
@@ -86,22 +83,17 @@ protected IObservable<bool> IsCollectionChanged<TOtherForm, TOtherModel>(
                 vms.Any(vm => vm.IsFormChanged || !this.IsNew && vm.IsNew))
             .Merge(this.Save.Select(_ => false))
             .Merge(this.Cancel.Select(_ => false));
-    }
 
     protected IObservable<bool> IsCollectionChangedSimple<TItem>(
-        Expression<Func<TForm, ReadOnlyObservableCollection<TItem>>> property,
+        Func<TForm, ReadOnlyObservableCollection<TItem>> property,
         Func<TForm, ICollection<TItem>> itemCollection)
-        where TItem : notnull
-    {
-        string propertyName = property.GetMemberName();
-
-        return property.Compile()(this.Self)
+        where TItem : notnull =>
+        property(this.Self)
             .ToObservableChangeSet()
             .ToCollection()
             .Select(items => !Enumerable.SequenceEqual(items, itemCollection(this.Self)))
             .Merge(this.Save.Select(_ => false))
             .Merge(this.Cancel.Select(_ => false));
-    }
 
     protected IObservable<bool> IsCollectionValid<TOtherForm>(ReadOnlyObservableCollection<TOtherForm> viewModels)
         where TOtherForm : IReactiveForm =>
@@ -115,7 +107,7 @@ protected ValidationHelper LocalizedValidationRule<T>(
         Expression<Func<TForm, T?>> property,
         Func<T?, bool> validate)
     {
-        var propertyName = property.GetMemberName();
+        string propertyName = property.GetMemberName();
         return this.Self.ValidationRule(
             property, validate, _ => this.ResourceManager.GetString($"{propertyName}Invalid") ?? String.Empty);
     }

src/KeyboardSwitch.Settings/App.axaml.cs

@@ -66,6 +66,9 @@ private async Task<MainViewModel> InitializeApp()
     {
         TransitioningContentControl.PageTransitionProperty.OverrideDefaultValue(typeof(ViewModelViewHost), null);
 
+        RxApp.DefaultExceptionHandler = Observer.Create<Exception>(e =>
+            this.Log().Error(e, "Unhandled exception in the settings app"));
+
         var services = new ServiceCollection();
         this.ConfigureServices(services);
 
@@ -83,8 +86,6 @@ private async Task<MainViewModel> InitializeApp()
         {
             var appSettings = await this.serviceProvider.GetRequiredService<IAppSettingsService>().GetAppSettings();
 
-            this.SetTheme(appSettings.AppTheme);
-
             var mainViewModel = new MainViewModel(appSettings);
             openExternally.InvokeCommand(mainViewModel.OpenExternally);
 
@@ -111,7 +112,7 @@ private async Task<MainViewModel> InitializeApp()
                 "Delete the settings and let the app recreate a compatible version",
                 e.Version);
 
-            this.desktop.Shutdown(2);
+            this.desktop.Shutdown((int)ExitCode.IncompatibleSettingsVersion);
             return null!;
         }
     }
@@ -125,6 +126,7 @@ private void ConfigureServices(IServiceCollection services)
         var config = new ConfigurationRoot([genericProvider, platformSpecificProvider]);
 
         var logger = SerilogLoggerFactory.CreateLogger(config);
+        Log.Logger = logger;
 
         services
             .AddOptions()

src/KeyboardSwitch.Settings/ExitCode.cs

@@ -0,0 +1,8 @@
+namespace KeyboardSwitch.Settings;
+
+public enum ExitCode
+{
+    Success = 0,
+    Error = 1,
+    IncompatibleSettingsVersion = 2
+}

src/KeyboardSwitch.Settings/Program.cs

@@ -1,14 +1,30 @@
+using Serilog;
+
+using Constants = Serilog.Core.Constants;
+
 namespace KeyboardSwitch.Settings;
 
 public static class Program
 {
     [STAThread]
-    public static void Main(string[] args)
+    public static int Main(string[] args)
     {
-        Directory.SetCurrentDirectory(Path.GetDirectoryName(AppContext.BaseDirectory) ?? String.Empty);
+        try
+        {
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(AppContext.BaseDirectory) ?? String.Empty);
+
+            return BuildAvaloniaApp()
+                .StartWithClassicDesktopLifetime(args);
+        } catch (Exception e)
+        {
+            Log.ForContext(Constants.SourceContextPropertyName, typeof(Program).FullName)
+                .Fatal(e, "The settings app has crashed");
 
-        BuildAvaloniaApp()
-            .StartWithClassicDesktopLifetime(args);
+            return (int)ExitCode.Error;
+        } finally
+        {
+            Log.CloseAndFlush();
+        }
     }
 
     public static AppBuilder BuildAvaloniaApp() =>

src/KeyboardSwitch.Windows/KeyboardSwitch.Windows.csproj

@@ -11,10 +11,10 @@
     <PackageReference Include="System.Interactive" Version="6.0.3" />
     <PackageReference Include="System.Interactive.Async" Version="6.0.3" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
-    <PackageReference Include="Vanara.Core" Version="4.1.4" />
-    <PackageReference Include="Vanara.PInvoke.Kernel32" Version="4.1.4" />
-    <PackageReference Include="Vanara.PInvoke.Shared" Version="4.1.4" />
-    <PackageReference Include="Vanara.PInvoke.User32" Version="4.1.4" />
+    <PackageReference Include="Vanara.Core" Version="4.1.6" />
+    <PackageReference Include="Vanara.PInvoke.Kernel32" Version="4.1.6" />
+    <PackageReference Include="Vanara.PInvoke.Shared" Version="4.1.6" />
+    <PackageReference Include="Vanara.PInvoke.User32" Version="4.1.6" />
   </ItemGroup>
 
   <ItemGroup>