fix: Notification code causing crash (#868)

IvanJosipovic · Jan 15, 2025 · acedaad · acedaad
1 parent e467d85
commit acedaad
Showing 1 changed file with 24 additions and 17 deletions.
diff --git a/src/KubeUI/Utilities.cs b/src/KubeUI/Utilities.cs
@@ -274,37 +274,44 @@ public static void HandleException(ILogger logger, INotificationManager notifica
     {
         if (sendNotification)
         {
-            if(ex is AggregateException aggregate)
+            try
             {
-                foreach (var item in aggregate.InnerExceptions)
+                if (ex is AggregateException aggregate)
                 {
-                    if (item is HttpOperationException opEx)
+                    foreach (var item in aggregate.InnerExceptions)
                     {
-                        var status = KubernetesYaml.Deserialize<V1Status>(opEx.Response.Content);
+                        if (item is HttpOperationException opEx)
+                        {
+                            var status = KubernetesJson.Deserialize<V1Status>(opEx.Response.Content);
 
-                        if (status != null)
+                            if (status != null)
+                            {
+                                notificationManage.Show(new Notification(status.Reason, status.Message + "\n\n" + status?.Details?.Causes?.Select(x => x.Message).Aggregate((x, y) => x + "\n" + y) ?? "", type, TimeSpan.FromSeconds(30)));
+                            }
+                        }
+                        else
                         {
-                            notificationManage.Show(new Notification(status.Reason, status.Message + "\n\n" + status?.Details?.Causes?.Select(x => x.Message).Aggregate((x, y) => x + "\n" + y) ?? "", type, TimeSpan.FromSeconds(30)));
+                            notificationManage.Show(new Notification(message, item.Message, type));
                         }
                     }
-                    else
+                }
+                else if (ex is HttpOperationException opEx)
+                {
+                    var status = KubernetesJson.Deserialize<V1Status>(opEx.Response.Content);
+
+                    if (status != null)
                     {
-                        notificationManage.Show(new Notification(message, item.Message, type));
+                        notificationManage.Show(new Notification(status.Reason, status.Message + "\n\n" + status?.Details?.Causes?.Select(x => x.Message).Aggregate((x, y) => x + "\n" + y) ?? "", type, TimeSpan.FromSeconds(30)));
                     }
                 }
-            }
-            else if (ex is HttpOperationException opEx)
-            {
-                var status = KubernetesYaml.Deserialize<V1Status>(opEx.Response.Content);
-
-                if (status != null)
+                else
                 {
-                    notificationManage.Show(new Notification(status.Reason, status.Message + "\n\n" + status?.Details?.Causes?.Select(x => x.Message).Aggregate((x, y) => x + "\n" + y) ?? "", type, TimeSpan.FromSeconds(30)));
+                    notificationManage.Show(new Notification(message, ex.Message, type));
                 }
             }
-            else
+            catch (Exception ex2)
             {
-                notificationManage.Show(new Notification(message, ex.Message, type));
+                logger.LogError(ex2, "Error sending Notification");
             }
         }