From a5bc79c46902eeb768bb1211b233e97114b862dc Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 25 Mar 2025 23:58:51 -0500 Subject: [PATCH] chore: update some logging methods --- src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs | 2 +- src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs | 2 +- src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs | 3 ++- src/PepperDash.Core/Comm/GenericTcpIpServer.cs | 3 ++- src/PepperDash.Core/Comm/GenericUdpServer.cs | 3 ++- src/PepperDash.Core/EthernetHelper.cs | 3 ++- src/PepperDash.Core/JsonToSimpl/Global.cs | 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs b/src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs index 7531f9e9..5ad2e29d 100644 --- a/src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs +++ b/src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs @@ -741,7 +741,7 @@ namespace PepperDash.Core { if (HeartbeatEnabled) { - Debug.Console(2, this, "Starting Heartbeat"); + this.LogVerbose("Starting Heartbeat"); if (HeartbeatSendTimer == null) { diff --git a/src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs b/src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs index 447632e3..93b195ca 100644 --- a/src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs +++ b/src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs @@ -686,7 +686,7 @@ namespace PepperDash.Core } catch (Exception e) { - this.LogException(ex, "DequeueEvent error"); + this.LogException(e, "DequeueEvent error"); } // Make sure to leave the CCritical section in case an exception above stops this thread, or we won't be able to restart it. if (DequeueLock != null) diff --git a/src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs b/src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs index df277f00..03a27827 100644 --- a/src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs +++ b/src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs @@ -17,6 +17,7 @@ using System.Text; using System.Text.RegularExpressions; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; +using PepperDash.Core.Logging; namespace PepperDash.Core { @@ -445,7 +446,7 @@ namespace PepperDash.Core /// public void Disconnect() { - Debug.Console(2, "Disconnect Called"); + this.LogVerbose("Disconnect Called"); DisconnectCalledByUser = true; if (IsConnected) diff --git a/src/PepperDash.Core/Comm/GenericTcpIpServer.cs b/src/PepperDash.Core/Comm/GenericTcpIpServer.cs index 680db5c5..6aa5e6b5 100644 --- a/src/PepperDash.Core/Comm/GenericTcpIpServer.cs +++ b/src/PepperDash.Core/Comm/GenericTcpIpServer.cs @@ -15,6 +15,7 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; +using PepperDash.Core.Logging; namespace PepperDash.Core { @@ -526,7 +527,7 @@ namespace PepperDash.Core { SocketErrorCodes error = myTcpServer.SendDataAsync(i, b, b.Length, (x, y, z) => { }); if (error != SocketErrorCodes.SOCKET_OK && error != SocketErrorCodes.SOCKET_OPERATION_PENDING) - Debug.Console(2, error.ToString()); + this.LogError("{error}",error.ToString()); } } } diff --git a/src/PepperDash.Core/Comm/GenericUdpServer.cs b/src/PepperDash.Core/Comm/GenericUdpServer.cs index e31c581c..a5a68c45 100644 --- a/src/PepperDash.Core/Comm/GenericUdpServer.cs +++ b/src/PepperDash.Core/Comm/GenericUdpServer.cs @@ -6,6 +6,7 @@ using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; using Newtonsoft.Json; +using PepperDash.Core.Logging; namespace PepperDash.Core { @@ -279,7 +280,7 @@ namespace PepperDash.Core } catch (Exception ex) { - Debug.Console(0, "GenericUdpServer Receive error: {0}{1}", ex.Message, ex.StackTrace); + this.LogException(ex, "GenericUdpServer Receive error"); } finally { diff --git a/src/PepperDash.Core/EthernetHelper.cs b/src/PepperDash.Core/EthernetHelper.cs index 0ccc50aa..88429886 100644 --- a/src/PepperDash.Core/EthernetHelper.cs +++ b/src/PepperDash.Core/EthernetHelper.cs @@ -1,5 +1,6 @@ using Crestron.SimplSharp; using Newtonsoft.Json; +using Serilog.Events; namespace PepperDash.Core { @@ -43,7 +44,7 @@ namespace PepperDash.Core { var status = CrestronEthernetHelper.GetEthernetParameter( CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_LINK_STATUS, 0); - Debug.Console(0, "LinkActive = {0}", status); + Debug.LogMessage(LogEventLevel.Information, "LinkActive = {0}", status); return status == ""; } } diff --git a/src/PepperDash.Core/JsonToSimpl/Global.cs b/src/PepperDash.Core/JsonToSimpl/Global.cs index be2e7951..8392fa61 100644 --- a/src/PepperDash.Core/JsonToSimpl/Global.cs +++ b/src/PepperDash.Core/JsonToSimpl/Global.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; +using Serilog.Events; //using PepperDash.Core; @@ -30,7 +31,7 @@ namespace PepperDash.Core.JsonToSimpl if (string.IsNullOrEmpty(master.UniqueID)) throw new InvalidOperationException("JSON Master cannot be added with a null UniqueId"); - Debug.Console(1, "JSON Global adding master {0}", master.UniqueID); + Debug.LogMessage(LogEventLevel.Debug, "JSON Global adding master {0}", master.UniqueID); if (Masters.Contains(master)) return;