fix: protect callbacks against failures (#11)

Co-authored-by: Mitch Freed <[email protected]>
casbin-net · Jan 20, 2024 · 7818a16 · 7818a16
1 parent e604b74
commit 7818a16
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/Casbin.Watcher.Redis/Casbin.Watcher.Redis.csproj b/Casbin.Watcher.Redis/Casbin.Watcher.Redis.csproj
@@ -23,7 +23,7 @@
   <ItemGroup>
     <PackageReference Include="Casbin.NET" Version="2.1.1" />
     <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
-    <PackageReference Include="System.Text.Json" Version="8.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.1" Condition="'$(TargetFramework)'=='netstandard2.1'" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Casbin.Watcher.Redis/RedisWatcher.cs b/Casbin.Watcher.Redis/RedisWatcher.cs
@@ -148,14 +148,18 @@ private void Subscribe()
             var isSelf = message.Id == Id;
             if (!(isSelf && _options.IgnoreSelf))
             {
-                if (_callbackWithMessage != null)
+                try
                 {
-                    _callbackWithMessage.Invoke(message);
-                }
-                else
-                {
-                    _callback?.Invoke();
+                    if (_callbackWithMessage != null)
+                    {
+                        _callbackWithMessage.Invoke(message);
+                    }
+                    else
+                    {
+                        _callback?.Invoke();
+                    }
                 }
+                catch {}
             }
         });
     }
@@ -170,14 +174,18 @@ private void SubscribeAsync()
             var isSelf = message.Id == Id;
             if (!(isSelf && _options.IgnoreSelf))
             {
-                if (_asyncCallbackWithMessage != null)
-                {
-                    _asyncCallbackWithMessage.Invoke(message);
-                }
-                else
+                try
                 {
-                    _asyncCallback?.Invoke();
+                    if (_asyncCallbackWithMessage != null)
+                    {
+                        _asyncCallbackWithMessage.Invoke(message);
+                    }
+                    else
+                    {
+                        _asyncCallback?.Invoke();
+                    }
                 }
+                catch {}
             }
         });
     }