fix: Adds try/catch around pre/post activation calls and adds JsonPro…

…perty decorators to Key and Name properties in interfaces
PepperDash · May 7, 2024 · 2558f44 · 2558f44
1 parent 165841b
commit 2558f44
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Pepperdash Core/CoreInterfaces.cs b/src/Pepperdash Core/CoreInterfaces.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using Newtonsoft.Json;
 using Serilog;
 
 namespace PepperDash.Core
@@ -15,6 +16,7 @@ public interface IKeyed
         /// <summary>
         /// Unique Key
         /// </summary>
+        [JsonProperty("key")]
 		string Key { get; }
     }
 
@@ -26,6 +28,7 @@ public interface IKeyName : IKeyed
         /// <summary>
         /// Isn't it obvious :)
         /// </summary>
+        [JsonProperty("name")]
 		string Name { get; }
     }
 

diff --git a/src/Pepperdash Core/Device.cs b/src/Pepperdash Core/Device.cs
@@ -99,7 +99,15 @@ public void AddPostActivationAction(Action act)
         public void PreActivate()
         {
             if (_PreActivationActions != null)
-                _PreActivationActions.ForEach(a => a.Invoke());
+                _PreActivationActions.ForEach(a => {
+					try
+					{
+						a.Invoke();
+					} catch (Exception e)
+					{ 
+						Debug.LogMessage(e, "Error in PreActivationAction: " + e.Message, this);
+					}
+            });
         }
 
 		/// <summary>
@@ -123,7 +131,16 @@ public bool Activate()
         public void PostActivate()
         {
             if (_PostActivationActions != null)
-                _PostActivationActions.ForEach(a => a.Invoke());
+                _PostActivationActions.ForEach(a => {
+                    try
+                    {
+                        a.Invoke();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogMessage(e, "Error in PostActivationAction: " + e.Message, this);
+                    }
+                });
         }
 
 		/// <summary>