SetDefaultObservableSystem

Cysharp · Jan 6, 2024 · c191b11 · c191b11
1 parent 88bc5bd
commit c191b11
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/sandbox/AvaloniaApplication1/MainWindow.axaml.cs b/sandbox/AvaloniaApplication1/MainWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Logging;
 using R3;
 using System;
 using System.Diagnostics;
@@ -15,7 +16,7 @@ public MainWindow()
 
 
 
-
+        
 
 
 

diff --git a/sandbox/AvaloniaApplication1/Program.cs b/sandbox/AvaloniaApplication1/Program.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Logging;
 using System;
 
 namespace AvaloniaApplication1;
@@ -18,5 +19,5 @@ public static AppBuilder BuildAvaloniaApp()
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace()
-            .UseR3(); // add this line
+            .UseR3(ex => Logger.Sink?.Log(LogEventLevel.Error, "R3", null, "R3 Unhandled Exception {0}", ex)); // add this line
 }
diff --git a/sandbox/WpfApp1/MainWindow.xaml.cs b/sandbox/WpfApp1/MainWindow.xaml.cs
@@ -18,7 +18,7 @@ public MainWindow()
 
 
 
-        R3.WPF.WpfProviderInitializer.SetDefaultProviders();
+        R3.WPF.WpfProviderInitializer.SetDefaultObservableSystem(ex => Trace.WriteLine($"R3 UnhandledException:{ex}"));
 
 
 

diff --git a/src/R3.Avalonia/AppBuilderR3InitializeExtensions.cs b/src/R3.Avalonia/AppBuilderR3InitializeExtensions.cs
@@ -5,24 +5,24 @@ namespace Avalonia; // Avalonia namespace
 
 public static class AppBuilderR3InitializeExtensions
 {
-    public static AppBuilder UseR3(this AppBuilder builder)
+    public static AppBuilder UseR3(this AppBuilder builder, Action<Exception> unhandledExceptionHandler)
     {
         // need to delay setup, initialize provider(dispatcher) need to determine platform
-        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultProviders());
+        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultObservableSystem(unhandledExceptionHandler));
     }
 
-    public static AppBuilder UseR3(this AppBuilder builder, DispatcherPriority priority)
+    public static AppBuilder UseR3(this AppBuilder builder, DispatcherPriority priority, Action<Exception> unhandledExceptionHandler)
     {
-        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultProviders(priority));
+        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultObservableSystem(unhandledExceptionHandler,priority));
     }
 
-    public static AppBuilder UseR3(this AppBuilder builder, int framesPerSecond)
+    public static AppBuilder UseR3(this AppBuilder builder, int framesPerSecond, Action<Exception> unhandledExceptionHandler)
     {
-        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultProviders(framesPerSecond));
+        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultObservableSystem(unhandledExceptionHandler,framesPerSecond));
     }
 
-    public static AppBuilder UseR3(this AppBuilder builder, DispatcherPriority priority, int framesPerSecond)
+    public static AppBuilder UseR3(this AppBuilder builder, DispatcherPriority priority, int framesPerSecond, Action<Exception> unhandledExceptionHandler)
     {
-        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultProviders(priority, framesPerSecond));
+        return builder.AfterSetup(_ => AvaloniaProviderInitializer.SetDefaultObservableSystem(unhandledExceptionHandler,priority, framesPerSecond));
     }
 }
diff --git a/src/R3.Avalonia/AvaloniaProviderInitializer.cs b/src/R3.Avalonia/AvaloniaProviderInitializer.cs
@@ -4,26 +4,30 @@ namespace R3.Avalonia;
 
 public static class AvaloniaProviderInitializer
 {
-    public static void SetDefaultProviders()
+    public static void SetDefaultObservableSystem(Action<Exception> unhandledExceptionHandler)
     {
+        ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
         ObservableSystem.DefaultTimeProvider = new AvaloniaDispatcherTimerProvider();
         ObservableSystem.DefaultFrameProvider = new AvaloniaDispatcherFrameProvider();
     }
 
-    public static void SetDefaultProviders(DispatcherPriority priority)
+    public static void SetDefaultObservableSystem(Action<Exception> unhandledExceptionHandler, DispatcherPriority priority)
     {
+        ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
         ObservableSystem.DefaultTimeProvider = new AvaloniaDispatcherTimerProvider(priority);
         ObservableSystem.DefaultFrameProvider = new AvaloniaDispatcherFrameProvider(priority);
     }
 
-    public static void SetDefaultProviders(int framesPerSecond)
+    public static void SetDefaultObservableSystem(Action<Exception> unhandledExceptionHandler, int framesPerSecond)
     {
+        ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
         ObservableSystem.DefaultTimeProvider = new AvaloniaDispatcherTimerProvider();
         ObservableSystem.DefaultFrameProvider = new AvaloniaDispatcherFrameProvider(framesPerSecond);
     }
 
-    public static void SetDefaultProviders(DispatcherPriority priority, int framesPerSecond)
+    public static void SetDefaultObservableSystem(Action<Exception> unhandledExceptionHandler, DispatcherPriority priority, int framesPerSecond)
     {
+        ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
         ObservableSystem.DefaultTimeProvider = new AvaloniaDispatcherTimerProvider(priority);
         ObservableSystem.DefaultFrameProvider = new AvaloniaDispatcherFrameProvider(framesPerSecond, priority);
     }

diff --git a/src/R3.WPF/WpfProviderInitializer.cs b/src/R3.WPF/WpfProviderInitializer.cs
@@ -1,23 +1,27 @@
-using System.Windows.Threading;
+using System.Windows;
+using System.Windows.Threading;
 
 namespace R3.WPF;
 
 public static class WpfProviderInitializer
 {
-    public static void SetDefaultProviders()
+    public static void SetDefaultObservableSystem(Action<Exception> unhandledExceptionHandler)
     {
+        ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
         ObservableSystem.DefaultTimeProvider = new WpfDispatcherTimerProvider();
         ObservableSystem.DefaultFrameProvider = new WpfRenderingFrameProvider();
     }
 
-    public static void SetDefaultProviders(DispatcherPriority priority)
+    public static void SetDefaultObservableSystem(Action<Exception> unhandledExceptionHandler, DispatcherPriority priority)
     {
+        ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
         ObservableSystem.DefaultTimeProvider = new WpfDispatcherTimerProvider(priority);
         ObservableSystem.DefaultFrameProvider = new WpfRenderingFrameProvider();
     }
 
-    public static void SetDefaultProviders(DispatcherPriority priority, Dispatcher dispatcher)
+    public static void SetDefaultObservableSystem(Action<Exception> unhandledExceptionHandler, DispatcherPriority priority, Dispatcher dispatcher)
     {
+        ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
         ObservableSystem.DefaultTimeProvider = new WpfDispatcherTimerProvider(priority, dispatcher);
         ObservableSystem.DefaultFrameProvider = new WpfRenderingFrameProvider();
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,7 +18,7 @@ public MainWindow()



		R3.WPF.WpfProviderInitializer.SetDefaultProviders();
		R3.WPF.WpfProviderInitializer.SetDefaultObservableSystem(ex => Trace.WriteLine($"R3 UnhandledException:{ex}"));



Expand Down