From 413955614913eea0de78131afefcac5deba06b13 Mon Sep 17 00:00:00 2001
From: Alex Johnson <alexj728@gmail.com>
Date: Fri, 2 Sep 2022 15:00:57 -0400
Subject: [PATCH] Changes some debug levels to notify upon errors in console

---
 .../Pepperdash Core/Comm/GenericSshClient.cs  |  8 ++---
 .../Comm/GenericTcpIpClient.cs                | 29 ++++++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
index 54ff6c9..f3d0d37 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
@@ -217,7 +217,7 @@ namespace PepperDash.Core
             {
                 if (IsConnected)
                 {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "Connection already connected.  Exiting Connect()");
+                    Debug.Console(1, this, "Connection already connected.  Exiting Connect()");
                 }
                 else
                 {
@@ -272,7 +272,7 @@ namespace PepperDash.Core
                                 Username, ie.Message);
                         }
                         else
-                            Debug.Console(1, this, errorLogLevel, "Error on connect:\r({0})", e);
+                            Debug.Console(1, this, errorLogLevel, "Error on connect:\r({0})", ie.Message);
 
                         DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
@@ -285,7 +285,7 @@ namespace PepperDash.Core
                     catch (Exception e)
                     {
                         var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
-                        Debug.Console(1, this, errorLogLevel, "Unhandled exception on connect:\r({0})", e);
+                        Debug.Console(1, this, errorLogLevel, "Unhandled exception on connect:\r({0})", e.Message);
                         DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
@@ -330,7 +330,7 @@ namespace PepperDash.Core
                 }
                 catch (Exception ex)
                 {
-                    Debug.Console(0, this, "Exception killing client: {0}", ex.Message);
+                    Debug.Console(1, this, "Exception killing client: {0}", ex.Message);
                 }
             }
         }
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index 0d5eb29..a9198da 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -292,7 +292,7 @@ namespace PepperDash.Core
             {
                 if (IsConnected)
                 {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "Connection already connected. Exiting Connect()");
+                    Debug.Console(1, this, "Connection already connected. Exiting Connect()");
                 }
                 else
                 {
@@ -319,10 +319,11 @@ namespace PepperDash.Core
             {
                 if (IsConnected || DisconnectCalledByUser == true)
                 {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "Reconnect no longer needed. Exiting Reconnect()");
+                    Debug.Console(1, this, "Reconnect no longer needed. Exiting Reconnect()");
                 }
                 else
                 {
+                    Debug.Console(1, this, "Attempting reconnect now");
                     Client.ConnectToServerAsync(ConnectToServerCallback);
                 }
             }
@@ -362,9 +363,15 @@ namespace PepperDash.Core
         /// <param name="c"></param>
 		void ConnectToServerCallback(TCPClient c)
 		{
-			Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
-			if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
-				WaitAndTryReconnect();
+            if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+            {
+                Debug.Console(0, this, "Server connection result: {0}", c.ClientStatus);
+                WaitAndTryReconnect();
+            }
+            else
+            {
+                Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
+            }
 		}
 
         /// <summary>
@@ -467,14 +474,14 @@ namespace PepperDash.Core
         /// <param name="clientSocketStatus"></param>
 		void Client_SocketStatusChange(TCPClient client, SocketStatus clientSocketStatus)
 		{
-			Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
-			if (client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
-				WaitAndTryReconnect();
-
-            if(clientSocketStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+            if (clientSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
             {
+                Debug.Console(0, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
+                WaitAndTryReconnect();
+            }
+            {
+                Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
 				Client.ReceiveDataAsync(Receive);
-				DisconnectCalledByUser = false;
             }
 
 			var handler = ConnectionChange;