Merge branch 'development' into hotfix/update-debug-file-path-for-vc4

Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs

@@ -65,11 +65,9 @@ namespace PepperDash.Core
 		public bool IsConnected 
 		{ 
 			// returns false if no client or not connected
-			get { return ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+            get { return Client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
 		}
 
-        private bool IsConnecting = false;
-
 		/// <summary>
 		/// S+ helper for IsConnected
 		/// </summary>
@@ -134,10 +132,10 @@ namespace PepperDash.Core
 
 		CTimer ReconnectTimer;
 
-		//string PreviousHostname;
+        //Lock object to prevent simulatneous connect/disconnect operations
-		//int PreviousPort;
+        private CCriticalSection connectLock = new CCriticalSection();
-		//string PreviousUsername;
+
-		//string PreviousPassword;
+        private bool DisconnectLogged = false;
 
 		/// <summary>
 		/// Typical constructor.
@@ -153,6 +151,14 @@ namespace PepperDash.Core
 			Username = username;
 			Password = password; 
 			AutoReconnectIntervalMs = 5000;
+
+            ReconnectTimer = new CTimer(o =>
+	            {
+                    if (ConnectEnabled)
+                    {
+                        Connect();
+                    }
+	            }, Timeout.Infinite);
 		}
 
 		/// <summary>
@@ -161,9 +167,16 @@ namespace PepperDash.Core
 		public GenericSshClient()
 			: base(SPlusKey)
 		{
-            StreamDebugging = new CommunicationStreamDebugging(SPlusKey);
 			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
 			AutoReconnectIntervalMs = 5000;
+
+            ReconnectTimer = new CTimer(o =>
+            {
+                if (ConnectEnabled)
+                {
+                    Connect();
+                }
+            }, Timeout.Infinite);
 		}
 
 		/// <summary>
@@ -194,115 +207,122 @@ namespace PepperDash.Core
 		/// </summary>
 		public void Connect()
         {
-            if (IsConnecting)
-            {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "Connection attempt in progress.  Exiting Connect()");
-                return;
-            }
-
-            IsConnecting = true;
-            ConnectEnabled = true;
-            Debug.Console(1, this, "attempting connect");
-
-            // Cancel reconnect if running.
-            if (ReconnectTimer != null)
-            {
-                ReconnectTimer.Stop();
-                ReconnectTimer = null;
-            }
-
-            // Don't try to connect if already
-            if (IsConnected)
-                return;
-
             // Don't go unless everything is here
             if (string.IsNullOrEmpty(Hostname) || Port < 1 || Port > 65535
                 || Username == null || Password == null)
             {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Connect failed.  Check hostname, port, username and password are set or not null");
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Connect failed.  Check hostname, port, username and password are set or not null");
                 return;
             }
 
-            // Cleanup the old client if it already exists
+            ConnectEnabled = true;
-            if (Client != null)
-            {
-                Debug.Console(1, this, "Cleaning up disconnected client");
-                Client.ErrorOccurred -= Client_ErrorOccurred;
-                KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
-            }
 
-            // This handles both password and keyboard-interactive (like on OS-X, 'nixes)
-            KeyboardInteractiveAuthenticationMethod kauth = new KeyboardInteractiveAuthenticationMethod(Username);
-            kauth.AuthenticationPrompt += new EventHandler<AuthenticationPromptEventArgs>(kauth_AuthenticationPrompt);
-            PasswordAuthenticationMethod pauth = new PasswordAuthenticationMethod(Username, Password);
-
-            Debug.Console(1, this, "Creating new SshClient");
-            ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
-            Client = new SshClient(connectionInfo);
-        
-            Client.ErrorOccurred -= Client_ErrorOccurred;
-            Client.ErrorOccurred += Client_ErrorOccurred;
-
-            //Attempt to connect
-            ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
             try
             {
-                Client.Connect();
+                connectLock.Enter();
-                TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 65534);
+                if (IsConnected)
-                TheStream.DataReceived += Stream_DataReceived;
-                //TheStream.ErrorOccurred += TheStream_ErrorOccurred;
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Connected");
-                ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
-                IsConnecting = false;
-                return; // Success will not pass here
-            }
-            catch (SshConnectionException e)
-            {
-                var ie = e.InnerException; // The details are inside!!
-                if (ie is SocketException)
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "'{0}' CONNECTION failure: Cannot reach host, ({1})", Key, ie.Message);
-                else if (ie is System.Net.Sockets.SocketException)
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "'{0}' Connection failure: Cannot reach host '{1}' on port {2}, ({3})",
-                        Key, Hostname, Port, ie.GetType());
-                else if (ie is SshAuthenticationException)
                 {
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Authentication failure for username '{0}', ({1})",
+                    Debug.Console(1, this, "Connection already connected.  Exiting Connect()");
-                        Username, ie.Message);
                 }
                 else
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Error on connect:\r({0})", e);
+                {
+                    Debug.Console(1, this, "Attempting connect");
 
-                ClientStatus = SocketStatus.SOCKET_STATUS_CONNECT_FAILED;
+                    // Cancel reconnect if running.
-                HandleConnectionFailure();
+                    ReconnectTimer.Stop();
+
+                    // Cleanup the old client if it already exists
+                    if (Client != null)
+                    {
+                        Debug.Console(1, this, "Cleaning up disconnected client");
+                        KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
+                    }
+
+                    // This handles both password and keyboard-interactive (like on OS-X, 'nixes)
+                    KeyboardInteractiveAuthenticationMethod kauth = new KeyboardInteractiveAuthenticationMethod(Username);
+                    kauth.AuthenticationPrompt += new EventHandler<AuthenticationPromptEventArgs>(kauth_AuthenticationPrompt);
+                    PasswordAuthenticationMethod pauth = new PasswordAuthenticationMethod(Username, Password);
+
+                    Debug.Console(1, this, "Creating new SshClient");
+                    ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
+                    Client = new SshClient(connectionInfo);
+
+                    Client.ErrorOccurred -= Client_ErrorOccurred;
+                    Client.ErrorOccurred += Client_ErrorOccurred;
+
+                    //Attempt to connect
+                    ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
+                    try
+                    {
+                        Client.Connect();
+                        TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 65534);
+                        TheStream.DataReceived += Stream_DataReceived;
+                        Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Connected");
+                        ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
+                        DisconnectLogged = false;
+                    }
+                    catch (SshConnectionException e)
+                    {
+                        var ie = e.InnerException; // The details are inside!!
+                        var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
+
+                        if (ie is SocketException)
+                            Debug.Console(1, this, errorLogLevel, "'{0}' CONNECTION failure: Cannot reach host, ({1})", Key, ie.Message);
+                        else if (ie is System.Net.Sockets.SocketException)
+                            Debug.Console(1, this, errorLogLevel, "'{0}' Connection failure: Cannot reach host '{1}' on port {2}, ({3})",
+                                Key, Hostname, Port, ie.GetType());
+                        else if (ie is SshAuthenticationException)
+                        {
+                            Debug.Console(1, this, errorLogLevel, "Authentication failure for username '{0}', ({1})",
+                                Username, ie.Message);
+                        }
+                        else
+                            Debug.Console(1, this, errorLogLevel, "Error on connect:\r({0})", ie.Message);
+
+                        DisconnectLogged = true;
+                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                        if (AutoReconnect)
+                        {
+                            Debug.Console(1, this, "Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                        }
+                    }
+                    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.Message);
+                        DisconnectLogged = true;
+                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                        if (AutoReconnect)
+                        {
+                            Debug.Console(1, this, "Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                        }
+                    }
+                }
             }
-            catch (Exception e)
+            finally
             {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Unhandled exception on connect:\r({0})", e);
+                connectLock.Leave();
-                ClientStatus = SocketStatus.SOCKET_STATUS_CONNECT_FAILED;
-                HandleConnectionFailure();
             }
-
-            ClientStatus = SocketStatus.SOCKET_STATUS_CONNECT_FAILED;
-            HandleConnectionFailure();
         }
 
-
-
 		/// <summary>
 		/// Disconnect the clients and put away it's resources.
 		/// </summary>
 		public void Disconnect()
 		{
-			Debug.Console(2, "Disconnect Called");
+            try
-			ConnectEnabled = false;
+            {
-			// Stop trying reconnects, if we are
+                connectLock.Enter();
-			if (ReconnectTimer != null)
+                // Stop trying reconnects, if we are
-			{
+                ReconnectTimer.Stop();
-				ReconnectTimer.Stop();
+                KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
-				ReconnectTimer = null;
+            }
-			}
+            finally
-
+            {
-            KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
+                connectLock.Leave();
+            }
 		}
 
         /// <summary>
@@ -314,44 +334,21 @@ namespace PepperDash.Core
 			IsConnecting = false;
             if (Client != null)
             {
-				Client.ErrorOccurred -= Client_ErrorOccurred;
+                try
-                Client.Disconnect();
+                {
-				Client.Dispose();
+                    Client.Disconnect();
-				
+                    Client.Dispose();
-                Client = null;
+                    Client = null;
-                ClientStatus = status;
+                    ClientStatus = status;
-                Debug.Console(1, this, "Disconnected");
+                    Debug.Console(1, this, "Disconnected client");
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(1, this, "Exception killing client: {0}", ex.Message);
+                }
             }
         }
 
-		/// <summary>
-		/// Anything to do with reestablishing connection on failures
-		/// </summary>
-		void HandleConnectionFailure()
-		{
-            KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-
-            Debug.Console(1, this, "Client nulled due to connection failure. AutoReconnect: {0}, ConnectEnabled: {1}", AutoReconnect, ConnectEnabled);
-		    if (AutoReconnect && ConnectEnabled)
-		    {
-		        Debug.Console(1, this, "Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-		        if (ReconnectTimer == null)
-		        {
-		            ReconnectTimer = new CTimer(o =>
-		            {
-		                Connect();
-		            }, AutoReconnectIntervalMs);
-		            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Attempting connection in {0} seconds",
-		                (float) (AutoReconnectIntervalMs/1000));
-		        }
-		        else
-		        {
-		            Debug.Console(1, this, "{0} second reconnect cycle running",
-		                (float) (AutoReconnectIntervalMs/1000));
-		        }
-		    }
-		}
-
         /// <summary>
         /// Kills the stream
         /// </summary>
@@ -363,6 +360,7 @@ namespace PepperDash.Core
 				TheStream.Close();
 				TheStream.Dispose();
 				TheStream = null;
+                Debug.Console(1, this, "Disconnected stream");
 			}
 		}
 
@@ -413,13 +411,28 @@ namespace PepperDash.Core
 		/// </summary>
 		void Client_ErrorOccurred(object sender, Crestron.SimplSharp.Ssh.Common.ExceptionEventArgs e)
 		{
-			if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
+            CrestronInvoke.BeginInvoke(o =>
-				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Disconnected by remote");
+            {
-			else
+                if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
-				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Unhandled SSH client error: {0}", e.Exception);
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Disconnected by remote");
+                else
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Unhandled SSH client error: {0}", e.Exception);
 
-			ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY;
+                try
-			HandleConnectionFailure();
+                {
+                    connectLock.Enter();
+                    KillClient(SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY);
+                }
+                finally
+                {
+                    connectLock.Leave();
+                }
+                if (AutoReconnect && ConnectEnabled)
+                {
+                    Debug.Console(1, this, "Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                    ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                }
+            });
 		}
 
 		/// <summary>
@@ -461,8 +474,6 @@ namespace PepperDash.Core
 			    Debug.Console(0, "Stack Trace: {0}", ex.StackTrace);
 
 				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed. Disconnected, closing");
-				ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY;
-				HandleConnectionFailure();
 			}
 		}
 
@@ -490,8 +501,6 @@ namespace PepperDash.Core
 			catch
 			{
 				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed. Disconnected, closing");
-				ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY;
-				HandleConnectionFailure();
 			}
 		}
 

Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs

@@ -5,9 +5,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
-
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Core
 {
@@ -39,23 +37,24 @@ namespace PepperDash.Core
 		public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
 
-		private string _Hostname { get; set;} 
+		private string _hostname;
+
         /// <summary>
         /// Address of server
         /// </summary>
-        public string Hostname {
+        public string Hostname
+        {
 			get
 			{
-				return _Hostname;
+				return _hostname;
 			}
 
 			set
 			{
-				_Hostname = value;
+			 _hostname = value;
-				if (Client != null)
+				if (_client != null)
 				{
-
+					_client.AddressClientConnectedTo = _hostname;
-					Client.AddressClientConnectedTo = _Hostname;
 				}
 			}
 		}
@@ -83,14 +82,14 @@ namespace PepperDash.Core
 		/// <summary>
 		/// The actual client class
 		/// </summary>
-		public TCPClient Client { get; private set; }
+		private TCPClient _client;
 
 		/// <summary>
-		/// True if connected to the server
+		/// Bool showing if socket is connected
 		/// </summary>
 		public bool IsConnected 
         { 
-            get { return Client != null && Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
+            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
         }
         
         /// <summary>
@@ -102,21 +101,19 @@ namespace PepperDash.Core
         }
 
 		/// <summary>
-		/// Status of the socket
+		/// _client socket status Read only
 		/// </summary>
 		public SocketStatus ClientStatus 
         { 
             get 
             {
-                if (Client == null)
+                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus; 
-                    return SocketStatus.SOCKET_STATUS_NO_CONNECT;
-                return Client.ClientStatus; 
             } 
         }
 
         /// <summary>
         /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
-        /// and IsConnected with be true when this == 2.
+        /// and IsConnected would be true when this == 2.
         /// </summary>
         public ushort UStatus
         {
@@ -124,7 +121,7 @@ namespace PepperDash.Core
         }
 
 		/// <summary>
-        /// Status of the socket
+        /// Status text shows the message associated with socket status
 		/// </summary>
 		public string ClientStatusText { get { return ClientStatus.ToString(); } }
 
@@ -140,7 +137,7 @@ namespace PepperDash.Core
 		public string ConnectionFailure { get { return ClientStatus.ToString(); } }
 
 		/// <summary>
-		/// If true, enables AutoConnect
+		/// bool to track if auto reconnect should be set on the socket
 		/// </summary>
 		public bool AutoReconnect { get; set; }
 
@@ -152,13 +149,14 @@ namespace PepperDash.Core
             get { return (ushort)(AutoReconnect ? 1 : 0); }
             set { AutoReconnect = value == 1; }
         }
+
 		/// <summary>
 		/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
 		/// </summary>
 		public int AutoReconnectIntervalMs { get; set; }
 
 		/// <summary>
-		/// Set only when the disconnect method is called.
+		/// Set only when the disconnect method is called
 		/// </summary>
 		bool DisconnectCalledByUser;
 
@@ -167,10 +165,14 @@ namespace PepperDash.Core
 		/// </summary>
 		public bool Connected
 		{
-			get { return Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+			get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
 		}
 
-		CTimer RetryTimer;
+        //Lock object to prevent simulatneous connect/disconnect operations
+        private CCriticalSection connectLock = new CCriticalSection();
+
+        // private Timer for auto reconnect
+		private CTimer RetryTimer;
 
         /// <summary>
         /// Constructor
@@ -183,13 +185,17 @@ namespace PepperDash.Core
 			: base(key)
 		{
             StreamDebugging = new CommunicationStreamDebugging(key);
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
             Hostname = address;
             Port = port;
             BufferSize = bufferSize;
-			AutoReconnectIntervalMs = 5000;
 
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            RetryTimer = new CTimer(o =>
-		}
+            {
+                Reconnect();
+            }, Timeout.Infinite);
+        }
 
         /// <summary>
         /// Constructor
@@ -202,6 +208,11 @@ namespace PepperDash.Core
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             AutoReconnectIntervalMs = 5000;
             BufferSize = 2000;
+
+            RetryTimer = new CTimer(o =>
+            {
+                Reconnect();
+            }, Timeout.Infinite);
         }
 
         /// <summary>
@@ -210,10 +221,14 @@ namespace PepperDash.Core
         public GenericTcpIpClient()
 			: base(SplusKey)
 		{
-            StreamDebugging = new CommunicationStreamDebugging(SplusKey);
 			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
 			AutoReconnectIntervalMs = 5000;
             BufferSize = 2000;
+
+            RetryTimer = new CTimer(o =>
+            {
+                Reconnect();
+            }, Timeout.Infinite);
 		}
 
         /// <summary>
@@ -232,7 +247,7 @@ namespace PepperDash.Core
             if (programEventType == eProgramStatusEventType.Stopping)
             {
                 Debug.Console(1, this, "Program stopping. Closing connection");
-				Disconnect();
+                Deactivate();
             }
         }
 
@@ -242,9 +257,11 @@ namespace PepperDash.Core
         /// <returns></returns>
 		public override bool Deactivate()
 		{
-            if (Client != null)
+            RetryTimer.Stop();
+            RetryTimer.Dispose();
+            if (_client != null)
             {
-                Client.SocketStatusChange -= this.Client_SocketStatusChange;
+             _client.SocketStatusChange -= this.Client_SocketStatusChange;
                 DisconnectClient();
             }
 			return true;
@@ -255,9 +272,6 @@ namespace PepperDash.Core
         /// </summary>
 		public void Connect()
 		{
-            if (IsConnected)
-                DisconnectClient();
-
             if (string.IsNullOrEmpty(Hostname))
             {
                 Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': No address set", Key);
@@ -271,36 +285,72 @@ namespace PepperDash.Core
                 }
             }
 
-            if (Client == null)
+            try
             {
-                Client = new TCPClient(Hostname, Port, BufferSize);
+                connectLock.Enter();
-                Client.SocketStatusChange -= Client_SocketStatusChange;
+                if (IsConnected)
-                Client.SocketStatusChange += Client_SocketStatusChange;
+                {
+                    Debug.Console(1, this, "Connection already connected. Exiting Connect()");
+                }
+                else
+                {
+                    //Stop retry timer if running
+                    RetryTimer.Stop();
+                    _client = new TCPClient(Hostname, Port, BufferSize);
+                    _client.SocketStatusChange -= Client_SocketStatusChange;
+                    _client.SocketStatusChange += Client_SocketStatusChange;
+                    DisconnectCalledByUser = false;
+                    _client.ConnectToServerAsync(ConnectToServerCallback);
+                }
+            }
+            finally
+            {
+                connectLock.Leave();
             }
-			DisconnectCalledByUser = false;
-			
-			Client.ConnectToServerAsync(ConnectToServerCallback); // (null);
 		}
 
+        private void Reconnect()
+        {
+            if (_client == null)
+            {
+                return;
+            }
+            try
+            {
+                connectLock.Enter();
+                if (IsConnected || DisconnectCalledByUser == true)
+                {
+                    Debug.Console(1, this, "Reconnect no longer needed. Exiting Reconnect()");
+                }
+                else
+                {
+                    Debug.Console(1, this, "Attempting reconnect now");
+                    _client.ConnectToServerAsync(ConnectToServerCallback);
+                }
+            }
+            finally
+            {
+                connectLock.Leave();
+            }
+        }
+
         /// <summary>
         /// Attempts to disconnect the client
         /// </summary>
 		public void Disconnect()
 		{
-            DisconnectCalledByUser = true;
+            try
-
-            // Stop trying reconnects, if we are
-            if (RetryTimer != null)
             {
+                connectLock.Enter();
+                DisconnectCalledByUser = true;
+
+                // Stop trying reconnects, if we are
                 RetryTimer.Stop();
-                RetryTimer = null;
-            }
-
-            if (Client != null)
-            {
                 DisconnectClient();
-                Client = null;
+            }
-                Debug.Console(1, this, "Disconnected");
+            finally
+            {
+                connectLock.Leave();
             }
 		}
 
@@ -309,11 +359,11 @@ namespace PepperDash.Core
         /// </summary>
         public void DisconnectClient()
         {
-            if (Client != null)
+            if (_client != null)
             {
                 Debug.Console(1, this, "Disconnecting client");
-                if(IsConnected)
+                if (IsConnected)
-                    Client.DisconnectFromServer();
+                    _client.DisconnectFromServer();
             }
         }
 
@@ -323,9 +373,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)
-			if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED && AutoReconnect)
+            {
-				WaitAndTryReconnect();
+                Debug.Console(0, this, "Server connection result: {0}", c.ClientStatus);
+                WaitAndTryReconnect();
+            }
+            else
+            {
+                Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
+            }
 		}
 
         /// <summary>
@@ -333,24 +389,23 @@ namespace PepperDash.Core
         /// </summary>
 		void WaitAndTryReconnect()
 		{
-            DisconnectClient();
+            CrestronInvoke.BeginInvoke(o =>
-            
-            if (Client != null)
             {
-                Debug.Console(1, this, "Attempting reconnect, status={0}", Client.ClientStatus);
+                try
-
+                {
-                if (!DisconnectCalledByUser)
+                    connectLock.Enter();
-                    RetryTimer = new CTimer(o => 
+                    if (!IsConnected && AutoReconnect && !DisconnectCalledByUser && _client != null)
                     {
-                        if (Client == null)
+                        DisconnectClient();
-                        {
+                        Debug.Console(1, this, "Attempting reconnect, status={0}", _client.ClientStatus);
-                            return;
+                        RetryTimer.Reset(AutoReconnectIntervalMs);
-                        }
+                    }
-                        
+                }
-                        Client.ConnectToServerAsync(ConnectToServerCallback); 
+                finally
-                    }, AutoReconnectIntervalMs);
+                {
-            }
+                    connectLock.Leave();
-
+                }
+            });
 		}
 
         /// <summary>
@@ -380,15 +435,13 @@ namespace PepperDash.Core
                         var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
 
                         if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        {
                             Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                        }
 
                         textHandler(this, new GenericCommMethodReceiveTextArgs(str));
-
+                    }                    
-                    }
-
-                    
                 }
-
                 client.ReceiveDataAsync(Receive);
             }
 		}
@@ -402,10 +455,8 @@ namespace PepperDash.Core
 			// Check debug level before processing byte array
             if (StreamDebugging.TxStreamDebuggingIsEnabled)
                 Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
-            if(Client != null)
+            if (_client != null)
-			    Client.SendData(bytes, bytes.Length);
+			    _client.SendData(bytes, bytes.Length);
-
-
 		}
 
 		/// <summary>
@@ -429,8 +480,8 @@ namespace PepperDash.Core
 		{
             if (StreamDebugging.TxStreamDebuggingIsEnabled)
                 Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
-            if(Client != null)
+            if (_client != null)
-			    Client.SendData(bytes, bytes.Length);
+			    _client.SendData(bytes, bytes.Length);
 		}
 
         /// <summary>
@@ -440,27 +491,20 @@ 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 (clientSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
-			if (client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED && !DisconnectCalledByUser && AutoReconnect)
+            {
-				WaitAndTryReconnect();
+                Debug.Console(0, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
-
+                WaitAndTryReconnect();
-			// Probably doesn't need to be a switch since all other cases were eliminated
+            }
-			switch (clientSocketStatus)
+            else
-			{
+            {
-				case SocketStatus.SOCKET_STATUS_CONNECTED:
+                Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
-					Client.ReceiveDataAsync(Receive);
+			    _client.ReceiveDataAsync(Receive);
-					DisconnectCalledByUser = false;
+            }
-					break;
-			}
 
 			var handler = ConnectionChange;
 			if (handler != null)
 				ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
-
-			// Relay the event
-			//var handler = SocketStatusChange;
-			//if (handler != null)
-			//    SocketStatusChange(this);
 		}
 	}
 
@@ -519,4 +563,4 @@ namespace PepperDash.Core
 
 	}
 
-}
+}

Pepperdash Core/Pepperdash Core/Logging/Debug.cs

@@ -410,7 +410,10 @@ namespace PepperDash.Core
             string format, params object[] items)
         {
             var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
-			LogError(errorLogLevel, str);
+            if (errorLogLevel != ErrorLogLevel.None)
+            {
+                LogError(errorLogLevel, str);
+            }
             if (Level >= level)
             {
                 Console(level, str);
@@ -424,7 +427,10 @@ namespace PepperDash.Core
             string format, params object[] items)
         {
             var str = string.Format(format, items);
-            LogError(errorLogLevel, str);
+            if (errorLogLevel != ErrorLogLevel.None)
+            {
+                LogError(errorLogLevel, str);
+            }
 			if (Level >= level)
 			{
 				Console(level, str);
@@ -566,6 +572,7 @@ namespace PepperDash.Core
                     String.Format(
                         @"Debug settings file migration not necessary. Using file at \user\debugSettings\program{0}",
                         InitialParametersClass.ApplicationNumber));
+
                 return;
             }