add logger method

log shorten legacy check
saintentropy · Nov 17, 2023 · 87c8860 · 87c8860
1 parent 37a666e
commit 87c8860
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1015,6 +1015,7 @@ protected DynamoModel(IStartConfiguration config)
 
             LogWarningMessageEvents.LogWarningMessage += LogWarningMessage;
             LogWarningMessageEvents.LogInfoMessage += LogInfoMessage;
+            DynamoConsoleLogger.LogMessageToDynamoConsole += LogMessageWrapper;
             StartBackupFilesTimer();
 
             TraceReconciliationProcessor = this;
@@ -1426,6 +1427,7 @@ public void Dispose()
 
             LogWarningMessageEvents.LogWarningMessage -= LogWarningMessage;
             LogWarningMessageEvents.LogInfoMessage -= LogInfoMessage;
+            DynamoConsoleLogger.LogMessageToDynamoConsole -= LogMessageWrapper;
             foreach (var ws in _workspaces)
             {
                 ws.Dispose();

diff --git a/src/Engine/ProtoCore/Lang/CallSite.cs b/src/Engine/ProtoCore/Lang/CallSite.cs
@@ -8,6 +8,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamoServices;
 using Newtonsoft.Json;
 using ProtoCore.DSASM;
 using ProtoCore.Exceptions;
@@ -280,9 +281,9 @@ public void LoadSerializedDataIntoTraceCache(string serializedTraceData)
                 var decompressedTraceData = DecompressSerializedTraceData(serializedTraceData);
                 newTraceData = JsonConvert.DeserializeObject<List<SingleRunTraceData>>(decompressedTraceData);
             }
-            catch
+            catch(Exception e)
             {
-                //do nothing.
+                DynamoConsoleLogger.OnLogMessageToDynamoConsole($"issue while deserializing trace data for callsite {callsiteID} : {e}");
             }
 
             if (newTraceData == null)
@@ -564,14 +565,13 @@ private void UpdateCallsiteExecutionState(Object callsiteData, RuntimeCore runti
                 }
             }*/
         }
-        //TODO write a unit test for this.
         private static bool CheckIfTraceDataIsLegacySOAPFormat(string base64EncodedTraceData)
         {
             var data = Convert.FromBase64String(base64EncodedTraceData);
-            if (data.Length > 71)
+            if (data.Length > 17)
             {
-                var header = Encoding.UTF8.GetString(data, 0, 72);
-                if (header == @"<SOAP-ENV:Envelope xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""")
+                var header = Encoding.UTF8.GetString(data, 0, 18);
+                if (header == @"<SOAP-ENV:Envelope")
                 {
                     return true;
                 }
@@ -1907,9 +1907,9 @@ public static IList<string> GetAllSerializablesFromSingleRunTraceData(
                 var data = DecompressSerializedTraceData(callSiteData.Data);
                 traceData = JsonConvert.DeserializeObject<List<SingleRunTraceData>>(data);
             }
-            catch
+            catch (Exception e)
             {
-                //Do nothing.
+                DynamoConsoleLogger.OnLogMessageToDynamoConsole($"issue while deserializing trace data for callsite {callSiteData.ID} : {e}");
             }
 
             if (traceData == null)

diff --git a/src/NodeServices/MessageEvents.cs b/src/NodeServices/MessageEvents.cs
@@ -58,4 +58,17 @@ internal static void OnLoadLibraryFailure(string failureMessage, string messageB
             LoadLibraryFailure?.Invoke(failureMessage, messageBoxTitle);
         }
     }
+    /// <summary>
+    /// Used to log to the dynamo console from places where we do not have a reference
+    /// to the Dynamo console.
+    /// </summary>
+    internal static class DynamoConsoleLogger
+    {
+        public static event Action<string> LogMessageToDynamoConsole;
+
+        public static void OnLogMessageToDynamoConsole(string message)
+        {
+            LogMessageToDynamoConsole?.Invoke(message);
+        }
+    }
 }